Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.5 grimoire by Arwed v. Merkatz (fd0f298f197525d81fb3d5bcc9a1569c835d0372)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Arwed v. Merkatz" <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.5 grimoire by Arwed v. Merkatz (fd0f298f197525d81fb3d5bcc9a1569c835d0372)
  • Date: Tue, 18 Jul 2006 13:07:17 -0500

GIT changes to stable-rc-0.5 grimoire by Arwed v. Merkatz <v.merkatz AT gmx.net>:

video-libs/xine-lib/DEPENDS | 19 +++++++++++++++++--
video-libs/xine-lib/DETAILS | 10 +++++-----
video-libs/xine-lib/HISTORY | 14 ++++++++++++++
video-libs/xine-lib/PRE_BUILD | 6 ++++--
4 files changed, 40 insertions(+), 9 deletions(-)

New commits:
commit fd0f298f197525d81fb3d5bcc9a1569c835d0372
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

xine-lib 1.1.2, SECURITY_PATCH=1
(cherry picked from 6c6bcb0793a90336d197c0092fa0e51715c95386 commit)

commit 293aa4c2ba2a65d1ce8797976bbf39ec52415288
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

Added patch to fix FLAC playback. Thanks a lot to Bearcat for the info!
(cherry picked from a2087b2e13b226299a41f031895309823343cbe0 commit)

commit 9a50a3b6e04f4fdf647de7c4e870508367af0e84
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

DETAILS: removed UPDATED
DEPENDS: added optional depends on X11-LIBS, optonal depends on libxvmc
added too if X11-LIBS is xorg-modular, some alignment fixes
(cherry picked from 5e2d7e596ea4dd6dd9c5205d52e86414e240fa87 commit)

diff --git a/video-libs/xine-lib/DEPENDS b/video-libs/xine-lib/DEPENDS
index e94d230..6beb000 100755
--- a/video-libs/xine-lib/DEPENDS
+++ b/video-libs/xine-lib/DEPENDS
@@ -1,5 +1,10 @@
depends zlib &&

+optional_depends X11-LIBS \
+ "--with-x" \
+ "" \
+ "To support X display" &&
+
# output devices
optional_depends "alsa-lib" "" "" "for ALSA audio output" &&
optional_depends "esound" "" "" "for esd audio output" &&
@@ -31,7 +36,17 @@ optional_depends "imagemagick"
# input plugins
optional_depends "gnome-vfs2" "" "" "for gnome-vfs input support" &&
optional_depends "samba" "" "" "for samba input support" &&
-optional_depends "vcdimager-unstable" \
+optional_depends "vcdimager-unstable" \
"--with-external-vcdnav" \
"" \
- "for dynamically linked vcd plugin"
+ "for dynamically linked vcd plugin" &&
+
+source $GRIMOIRE/FUNCTIONS &&
+
+if check_if_xorg_modular_libs ; then
+ optional_depends libxvmc \
+ "--with-xvmc-lib=${INSTALL_ROOT}/usr/lib \
+ --with-xxmc-lib=${INSTALL_ROOT}/usr/lib" \
+ "" \
+ "For XvMC plugin"
+fi
diff --git a/video-libs/xine-lib/DETAILS b/video-libs/xine-lib/DETAILS
index 89f3017..85a367b 100755
--- a/video-libs/xine-lib/DETAILS
+++ b/video-libs/xine-lib/DETAILS
@@ -1,14 +1,14 @@
SPELL=xine-lib
- VERSION=1.1.1
- SOURCE=$SPELL-$VERSION.tar.gz
+ VERSION=1.1.2
+ SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/xine/$SOURCE
WEB_SITE=http://xine.sourceforge.net
ENTERED=20010927
- UPDATED=20051024
-
SOURCE_HASH=sha512:cb669a0b9ca4e3c5d4c4c8b156e26dab0a1dc0b48a5d73727f2d53a437560170820d81c6fd2a5ead21361eb645bda8e5c97017a6cf0019f70b0761b935cc4df1
+
SOURCE_HASH=sha512:ae736be0a23a865652e0eb1d33af649c7d9ff992b2d6a67e59448fb3d43a2bba3a51f98d2d596b7473e88b348e0b7e43f1ad2369c287304a1fed1a5f79b2f7a1
LICENSE[0]=GPL
- PATCHLEVEL=1
+ SECURITY_PATCH=1
+ PATCHLEVEL=2
KEYWORDS="player video libs"
SHORT="xine is a free video player."
cat << EOF
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 14ec213..01eede4 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,17 @@
+2006-07-11 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.2, SECURITY_PATCH=1, CVE-2005-4048, CVE-2006-2802
+ * PRE_BUILD, xine_flac.diff: removed patch, has been integrated
+
+2006-07-06 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Apply patch to fix flac playback. Thanks, Bearcat!
+ * xine_flac.diff: Added.
+ * DETAILS: PATCHLEVEL++
+
+2006-07-05 Pol Vinogradov <vin.public AT gmail.com>
+ * DETAILS: removed UPDATED
+ * DEPENDS: added optional depends on X11-LIBS, optonal depends on
+ libxvmc added too if X11-LIBS is xorg-modular, some alignment fixes
+
2006-05-27 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DEPENDS: changed ffmpeg-cvs to ffmpeg-svn

diff --git a/video-libs/xine-lib/PRE_BUILD b/video-libs/xine-lib/PRE_BUILD
index 4fb801b..bd2e595 100755
--- a/video-libs/xine-lib/PRE_BUILD
+++ b/video-libs/xine-lib/PRE_BUILD
@@ -1,6 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+
# fix a typo (missing quoting) so detection of ffmpeg-cvs works correctly
# compiles but fails to run otherwise
-sedit 's/x$FFMPEG_POSTPROC_LIBS/"\0"/' configure &&
-sedit 's/$(FFMPEG_LIBS)/\0 $(FFMPEG_POSTPROC_LIBS)/'
src/libffmpeg/Makefile.in
+sedit 's/x$FFMPEG_POSTPROC_LIBS/"\0"/' configure &&
+sedit 's/$(FFMPEG_LIBS)/\0 $(FFMPEG_POSTPROC_LIBS)/' \
+ src/libffmpeg/Makefile.in



  • [SM-Commit] GIT changes to stable-rc-0.5 grimoire by Arwed v. Merkatz (fd0f298f197525d81fb3d5bcc9a1569c835d0372), Arwed v. Merkatz, 07/18/2006

Archive powered by MHonArc 2.6.24.

Top of Page