New commits:
commit e01377777be80d5a677d65cfab0a6de14e2b7a0d
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)
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
xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It also
diff --git a/video-libs/xine-lib/HISTORY b/video-libs/xine-lib/HISTORY
index 431f140..0af0b86 100644
--- a/video-libs/xine-lib/HISTORY
+++ b/video-libs/xine-lib/HISTORY
@@ -1,3 +1,7 @@
+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-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..5e07481 100755
--- a/video-libs/xine-lib/PRE_BUILD
+++ b/video-libs/xine-lib/PRE_BUILD
@@ -2,5 +2,6 @@ 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-0.4 grimoire by Arwed v. Merkatz (e01377777be80d5a677d65cfab0a6de14e2b7a0d),
Arwed v. Merkatz, 07/18/2006