[106997] trunk/dports/multimedia/transcode

[devans at macports.org]

Revision: 106997
          https://trac.macports.org/changeset/106997
Author:   devans at macports.org
Date:     2013-06-13 11:56:55 -0700 (Thu, 13 Jun 2013)
Log Message:
-----------
transcode: update variants
 * remove +no_x11, add +x11 instead (#39383)
 * fix variants which have no effect unless +experimental is included
 * disable via patch experimental lavf encoder (broken)

Modified Paths:
--------------
    trunk/dports/multimedia/transcode/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/transcode/files/patch-encode-Makefile.in.diff

Modified: trunk/dports/multimedia/transcode/Portfile
===================================================================
--- trunk/dports/multimedia/transcode/Portfile	2013-06-13 16:42:06 UTC (rev 106996)
+++ trunk/dports/multimedia/transcode/Portfile	2013-06-13 18:56:55 UTC (rev 106997)
@@ -5,7 +5,7 @@
 
 name        transcode
 version     1.1.7
-revision    8
+revision    9
 epoch       1
 license     GPL-2+
 categories  multimedia
@@ -38,10 +38,7 @@
 
 depends_build   port:pkgconfig
 
-depends_lib     port:xorg-libXv \
-                port:xorg-libXaw \
-                port:xpm \
-                path:lib/libavcodec.dylib:ffmpeg \
+depends_lib     path:lib/libavcodec.dylib:ffmpeg \
                 port:libmpeg2 \
                 port:libdvdread \
                 port:jpeg \
@@ -52,28 +49,23 @@
 patchfiles      patch-configure.diff \
                 patch-avilib-avidump.c.diff \
                 patch-ffmpeg-0.11.diff \
-                patch-filter-filter_pp.c.diff
+                patch-filter-filter_pp.c.diff \
+                patch-encode-Makefile.in.diff
 
 configure.args  --disable-mmx \
                 --enable-libmpeg2 \
                 --enable-libmpeg2convert \
-                --x-includes=${prefix}/include \
-                --x-libraries=${prefix}/lib
+                --without-x
 
 # Optional components
 
-#
-# libquicktime is not universal
-# mjpegtools is not universal
-#
-
 universal_variant no
 
 variant mmx description {enable mmx optimizations} {
      configure.args-delete --disable-mmx
 }
 
-variant full requires a52dec faac freetype imagemagick libdv libogg libpostproc libquicktime libsdl libtheora libvorbis libxml2 lzo mjpegtools x264 xvid description {enable all optional components except deprecated and experimental} {
+variant full requires a52dec faac freetype imagemagick libdv libogg libpostproc libquicktime libsdl libtheora libvorbis libxml2 lzo mjpegtools x264 xvid description {enable all optional components except deprecated} {
 }
 
 variant a52dec description {enable support for decoding ATSC A/52 streams} {
@@ -81,7 +73,7 @@
     configure.args-append --enable-a52 --with-a52-prefix=${prefix}
 }
 
-variant faac description {enable AAC encoding support via libfaac} {
+variant faac requires experimental description {enable AAC encoding support via libfaac (experimental)} {
     depends_lib-append port:faac
     configure.args-append --enable-faac --with-faac-prefix=${prefix}
 }
@@ -130,7 +122,7 @@
     configure.args-append --enable-libxml2
 }
 
-variant lzo description {enable lossless data compression via lzo2} {
+variant lzo requires experimental description {enable lossless data compression via lzo2 (experimental)} {
     depends_lib-append port:lzo2
     configure.args-append --enable-lzo --with-lzo-prefix=${prefix}
 }
@@ -140,12 +132,12 @@
     configure.args-append --enable-mjpegtools
 }
 
-variant x264 description {enable support for encoding H264/AVC video} {
+variant x264 requires experimental description {enable support for encoding H264/AVC video (experimental)} {
     depends_lib-append port:x264
     configure.args-append --enable-x264
 }
 
-variant xvid description {enable support for the open Xvid video codec} {
+variant xvid requires experimental description {enable support for the open Xvid video codec (experimental)} {
     depends_lib-append port:XviD
     configure.args-append --enable-xvid --with-xvid-prefix=${prefix}
 }
@@ -167,15 +159,17 @@
     configure.args-append --enable-sdl
 }
 
-variant no_x11 description {disable X11 options} {
-    depends_lib-delete port:xorg-libXv
-    depends_lib-delete port:xorg-libXaw
-    depends_lib-delete port:xpm
-    configure.args-delete --x-includes=${prefix}/include
-    configure.args-delete --x-libraries=${prefix}/lib
-    configure.args-append --without-x
+variant x11 {
+    depends_lib-append port:xorg-libXv
+    depends_lib-append port:xorg-libXaw
+    depends_lib-append port:xpm
+    configure.args-append --x-includes=${prefix}/include
+    configure.args-append --x-libraries=${prefix}/lib
+    configure.args-delete --without-x
 }
 
+default_variants +x11
+
 platform darwin {
     configure.args-append --build=${build_arch}-apple-darwin${os.major}
 }

Added: trunk/dports/multimedia/transcode/files/patch-encode-Makefile.in.diff
===================================================================
--- trunk/dports/multimedia/transcode/files/patch-encode-Makefile.in.diff	                        (rev 0)
+++ trunk/dports/multimedia/transcode/files/patch-encode-Makefile.in.diff	2013-06-13 18:56:55 UTC (rev 106997)
@@ -0,0 +1,10 @@
+--- encode/Makefile.in.orig	2013-06-13 10:14:52.000000000 -0700
++++ encode/Makefile.in	2013-06-13 10:16:26.000000000 -0700
+@@ -395,7 +395,6 @@
+ @ENABLE_EXPERIMENTAL_TRUE@	encode_copy.la \
+ @ENABLE_EXPERIMENTAL_TRUE@	$(ENCODE_FAAC) \
+ @ENABLE_EXPERIMENTAL_TRUE@	$(ENCODE_LAME) \
+- at ENABLE_EXPERIMENTAL_TRUE@	$(ENCODE_LAVC) \
+ @ENABLE_EXPERIMENTAL_TRUE@	$(ENCODE_LZO) \
+ @ENABLE_EXPERIMENTAL_TRUE@	encode_null.la \
+ @ENABLE_EXPERIMENTAL_TRUE@	$(ENCODE_X264) \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130613/0befd521/attachment.html>