[SM-Commit] GIT changes to master grimoire by Arjan Bouter (de122ae47a71da895ba9ec05c0d88973ab1c10fc)

Arjan Bouter scm at sourcemage.org
Mon Mar 12 11:31:10 EDT 2012


GIT changes to master grimoire by Arjan Bouter <abouter at sourcemage.org>:

 video-libs/xvid/HISTORY |    3 +++
 video-libs/xvid/INSTALL |    3 +++
 video/transcode/DEPENDS |   37 ++++++++++++++++++++++++++++++++-----
 video/transcode/HISTORY |    5 +++++
 4 files changed, 43 insertions(+), 5 deletions(-)

New commits:
commit de122ae47a71da895ba9ec05c0d88973ab1c10fc
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    transcode: added missing dependencies, made ffmpeg and libmpeg2 optional
    and completed xvid options

commit 16fce786f1a8873648ced9c11a5633aa0ea66106
Author: Arjan Bouter <abouter at sourcemage.org>
Commit: Arjan Bouter <abouter at sourcemage.org>

    xvid: added INSTALL for a symlink to fix building transcode with xvid
    support

diff --git a/video-libs/xvid/HISTORY b/video-libs/xvid/HISTORY
index 247dbb7..f562eb7 100644
--- a/video-libs/xvid/HISTORY
+++ b/video-libs/xvid/HISTORY
@@ -1,3 +1,6 @@
+2012-03-12 Arjan Bouter <abouter at sourcemage.org>
+	* INSTALL: added libxvidcore.so symlink
+
 2011-07-20 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.3.2
 
diff --git a/video-libs/xvid/INSTALL b/video-libs/xvid/INSTALL
new file mode 100755
index 0000000..5053a58
--- /dev/null
+++ b/video-libs/xvid/INSTALL
@@ -0,0 +1,3 @@
+default_install &&
+cd "${INSTALL_ROOT}/usr/lib" &&
+ln -vsf libxvidcore.so.4 libxvidcore.so
diff --git a/video/transcode/DEPENDS b/video/transcode/DEPENDS
index 5153e7a..9b22e2f 100755
--- a/video/transcode/DEPENDS
+++ b/video/transcode/DEPENDS
@@ -1,10 +1,22 @@
-# auto* for configure hacking
+ auto* for configure hacking
 depends  autoconf    &&
 depends  automake    &&
 
 depends  zlib        &&
-depends  libmpeg2    &&
-depends  LIBAVCODEC  &&
+
+optional_depends  LIBAVCODEC '--enable-ffmpeg' \
+                             '--disable-ffmpeg' \
+                             'for ffmpeg support' &&
+
+optional_depends  libv4l '--enable-v4l --enable-libv4l2' \
+                         '--disable-v4l' \
+                         'for video4linux support' &&
+
+optional_depends  alsa-lib \
+                  '--enable-alsa' \
+                  '--disable-alsa' \
+                  'for alsa audio support' &&
+
 optional_depends  nasm                                     \
                   ""                                       \
                   ""                                       \
@@ -35,6 +47,11 @@ optional_depends  libdv                         \
                   "--disable-libdv"             \
                   "for Quasar DV code support"  &&
 
+optional_depends  faac \
+                  '--enable-faac' \
+                  '--disable-faac' \
+                  'for faac support' &&
+
 optional_depends  lame                \
                   "--enable-lame"     \
                   "--disable-lame"    \
@@ -91,10 +108,20 @@ optional_depends  JPEG                      \
                   "for JPEG image support"  &&
 
 optional_depends  xvid                             \
-                  ""                               \
-                  ""                               \
+                  "--enable-xvid"                  \
+                  "--disable-xvid"                 \
                   "for xvid de-/encoding support"  &&
 
+optional_depends  x264 \
+                  '--enable-x264' \
+                  '--disable-x264' \
+                  'for x264 support' &&
+
+optional_depends  libmpeg2 \
+                  '--enable-libmpeg2' \
+                  '--disable-libmpeg2' \
+                  'for mpeg2 support' &&
+
 optional_depends  libmpeg3                                    \
                   "--enable-libmpeg3"                         \
                   "--disable-libmpeg3"                        \
diff --git a/video/transcode/HISTORY b/video/transcode/HISTORY
index 456277f..031e4a7 100644
--- a/video/transcode/HISTORY
+++ b/video/transcode/HISTORY
@@ -1,3 +1,8 @@
+2012-03-12 Arjan Bouter <abouter at sourcemage.org>
+	* DEPENDS: made libmpeg2 and LIBAVCODEC optional,
+	  added missing deps on libv4l, alsa-lib, faac and x264.
+	  completed options for xvid.
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 


More information about the SM-Commit mailing list