Source Mage code commit list

[Ladislav Hagara <scm AT sourcemage.org>]

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

 video-libs/xine-lib/DETAILS   |    4 ++--
 video-libs/xine-lib/HISTORY   |    5 +++++
 video-libs/xine-lib/PRE_BUILD |    5 +----
 video-libs/xine-lib/compat.c  |   28 ++++++++++++++++++++++++++++
 4 files changed, 36 insertions(+), 6 deletions(-)

New commits:
commit 182e11648230a7c23c34e129fdfbe8bce98fdfbd
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    xine-lib 1.1.18
    compat.c accidentally omitted from the official tarball :-(

diff --git a/video-libs/xine-lib/DETAILS b/video-libs/xine-lib/DETAILS
index fb946b8..3845923 100755
--- a/video-libs/xine-lib/DETAILS
+++ b/video-libs/xine-lib/DETAILS
@@ -1,6 +1,6 @@
            SPELL=xine-lib
-         VERSION=1.1.17
-     
SOURCE_HASH=sha512:26ab613abc595906f03b01e0b5c2472f13bbe1145c4693503a3506d69eaea5a14dc09c6965be10f1c368e9f0015a380c5c5145b47c9a607e624b54e28341eba5
+         VERSION=1.1.18
+     
SOURCE_HASH=sha512:e02873e197122f398161872f920ff8e75603185da950b916dc3addc9c57a5ec60ed4f57eace7d24c719fba9fd5cbfc1c95273440d6a919874c92d886a685f1a0
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index a8a3e03..f81224d 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,8 @@
+2010-02-24 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 1.1.18
+       * PRE_BUILD: removed sedit and added copying of compat.c
+       * compat.c: added, accidentally omitted from the tarball
+
 2010-01-02 Arwed v. Merkatz <v.merkatz AT gmx.net>
        * DEPENDS: LIBAVCODEC is mandatory, the included ffmpeg is too old,
          bug #15541
diff --git a/video-libs/xine-lib/PRE_BUILD b/video-libs/xine-lib/PRE_BUILD
index 76f38e8..9307824 100755
--- a/video-libs/xine-lib/PRE_BUILD
+++ b/video-libs/xine-lib/PRE_BUILD
@@ -1,6 +1,3 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
-if [[ $(get_spell_provider $SPELL LIBAVCODEC) == "ffmpeg-svn" ]]; then
-  sedit  "s/PIX_FMT_RGBA32/PIX_FMT_RGB32/"  \
-         src/combined/ffmpeg/ff_video_decoder.c
-fi
+cp $SPELL_DIRECTORY/compat.c src/dxr3/compat.c
diff --git a/video-libs/xine-lib/compat.c b/video-libs/xine-lib/compat.c
new file mode 100644
index 0000000..a4722f9
--- /dev/null
+++ b/video-libs/xine-lib/compat.c
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2010 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ */
+
+/* For compatibility with em8300 < 0.18.0 */
+int dxr3_compat_ioctl (int fd, int rq, void *arg)
+{
+  int ret = ioctl (fd, rq, arg);
+  if (ret < 0 && errno == EINVAL || errno == ENOTTY)
+    ret = ioctl (fd, rq & 0xFF, arg);
+  return ret;
+}