sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (7b2f9400fabc0826a33ed9e1a1838cbb6c0c4677)

From: Thomas Orgis <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (7b2f9400fabc0826a33ed9e1a1838cbb6c0c4677)
Date: Sat, 21 Jul 2012 01:18:43 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

video/transcode/DEPENDS | 30 +++++++++++++++++-------------
video/transcode/HISTORY | 3 +++
2 files changed, 20 insertions(+), 13 deletions(-)

New commits:
commit 06321465949d9bd57d54ab70711454b104646a52
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

transcode: make it build again

diff --git a/video/transcode/DEPENDS b/video/transcode/DEPENDS
index 9b22e2f..f7c89d1 100755
--- a/video/transcode/DEPENDS
+++ b/video/transcode/DEPENDS
@@ -1,4 +1,4 @@
- auto* for configure hacking
+# auto* for configure hacking
depends autoconf &&
depends automake &&

@@ -22,10 +22,11 @@ optional_depends nasm
\
"" \
"for mpeg encoding with bbmpeg support" &&

-optional_depends avifile \
- "--enable-avifile
--with-avifile-includes=${INSTALL_ROOT}/usr/include/avifile-$(installed_version
avifile | awk -F'.' '{print $1"."$2}')" \
- "--disable-avifile" \
- "for AVI decoding support using avifile" &&
+# unknown to v1.1.7
+#optional_depends avifile \
+# "--enable-avifile
--with-avifile-includes=${INSTALL_ROOT}/usr/include/avifile-$(installed_version
avifile | awk -F'.' '{print $1"."$2}')" \
+# "--disable-avifile" \
+# "for AVI decoding support using avifile" &&

optional_depends a52dec \
"--enable-a52" \
@@ -107,10 +108,12 @@ optional_depends JPEG \
"--disable-libjpeg" \
"for JPEG image support" &&

-optional_depends xvid \
- "--enable-xvid" \
- "--disable-xvid" \
- "for xvid de-/encoding support" &&
+# libvxidcore now incompatible?
+# checking for xvid_global in -lxvidcore... no
+#optional_depends xvid \
+# "--enable-xvid" \
+# "--disable-xvid" \
+# "for xvid de-/encoding support" &&

optional_depends x264 \
'--enable-x264' \
@@ -122,10 +125,11 @@ optional_depends libmpeg2 \
'--disable-libmpeg2' \
'for mpeg2 support' &&

-optional_depends libmpeg3 \
- "--enable-libmpeg3" \
- "--disable-libmpeg3" \
- "for decoding of MPEG files with libmpeg3" &&
+# unknown to 1.1.7
+#optional_depends libmpeg3 \
+# "--enable-libmpeg3" \
+# "--disable-libmpeg3" \
+# "for decoding of MPEG files with libmpeg3" &&

optional_depends mjpegtools \
"--enable-mjpegtools" \
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index 1c0581e..da528ff 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,6 @@
+2012-07-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: hotfix to make it build (disabling xvid)
+
2012-03-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.1.7, SOURCE_URL[0] updated

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (7b2f9400fabc0826a33ed9e1a1838cbb6c0c4677), Thomas Orgis, 07/21/2012