Ticket #31185: no_no_variants.patch

Portfile

@@ -9 +9 @@
 conflicts       ffmpeg-devel
 epoch           1
 version         0.7.3
-license         nonfree GPL-2+ LGPL-2.1+
+license         LGPL-2.1+
 categories      multimedia
 maintainers     devans openmaintainer
 
@@ -63 +63 @@
                 port:libtheora \
                 port:dirac \
                 port:schroedinger \
-                port:faac \
-                port:faad2 \
                 path:lib/libspeex.dylib:speex \
-                port:XviD \
-                port:x264 \
                 port:libvpx \
                 path:lib/pkgconfig/sdl.pc:libsdl \
                 port:bzip2 \
@@ -103 +99 @@
 
 configure.cflags-append    -DHAVE_LRINTF ${configure.cppflags}
 configure.args \
-        --enable-gpl \
-        --enable-postproc \
         --enable-swscale --enable-avfilter \
         --enable-libmp3lame \
         --enable-libvorbis \
         --enable-libtheora \
         --enable-libdirac --enable-libschroedinger \
-        --enable-libfaac \
-        --enable-libxvid \
-        --enable-libx264 \
         --enable-libvpx \
         --enable-libspeex \
-        --enable-nonfree \
         --mandir=${prefix}/share/man \
         --enable-shared --enable-pthreads \
         --disable-indevs \
+        --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext \
         --cc=${configure.cc}
 
 #add --enable-libopenjpeg when problems with openjpeg.h are resolved
@@ -165 +156 @@
     }
 }
 
-variant no_mmx description {disable all x86 asm optimizations} {
-    configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
+variant mmx description {enable all x86 asm optimizations} {
+    configure.args-delete   --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
 }
 
-variant no_gpl description {disallow use of GPL code, license will be LGPL} {
-    configure.args-delete   --enable-gpl \
+variant gpl description {allow use of GPL code, license will be GPL} {
+    configure.args-append   --enable-gpl \
                             --enable-postproc \
-                            --enable-libfaad \
                             --enable-libx264 \
-                            --enable-libxvid
-    depends_lib-delete      port:faad2 \
+                            --enable-libxvid \
+                            #--enable-libfaad
+    depends_lib-append      port:faad2 \
                             port:XviD
-    depends_build-delete    port:x264
-    license-delete          GPL-2+
+    depends_build-append    port:x264
+    license-append          GPL-2+
 }
 
-variant no_nonfree description {disallow use of nonfree code, libraries and binaries will be redistributable under GPL/LGPL} {
-    configure.args-delete   --enable-nonfree \
+variant nonfree description {allow use of nonfree code, libraries and binaries will not be redistributable} {
+    configure.args-append   --enable-nonfree \
                             --enable-libfaac
-    depends_lib-delete      port:faac
-    license-delete          nonfree
+    depends_lib-append      port:faac
+    license-append          nonfree
 }
 # the build server uses the default variants, and we want distributable binaries
-default_variants    +no_nonfree
+default_variants    +gpl +mmx
 
 #
 # jack indev support is currently broken
@@ -201 +192 @@
     depends_lib-append port:jack
 }
 
-if {![variant_isset no_nonfree]} {
+if {[variant_isset nonfree]} {
 notes "
 *******
 ******* This build of ${name} includes nonfree code as follows:
@@ -217 +208 @@
 *******     libavformat
 *******     libavutil
 *******
-******* To remove this restriction use variant +no_nonfree
+******* To remove this restriction use variant -nonfree
 *******
 "
-} elseif {![variant_isset no_gpl]} {
+} elseif {[variant_isset gpl]} {
 notes "
 *******
 ******* This build of ${name} includes GPLed code and
@@ -233 +224 @@
 *******      libx264
 *******      libxvid
 *******
-******* To include only LGPLed code use variant +no_gpl +no_nonfree
+******* To include only LGPLed code use variant -gpl -nonfree
 *******
 "
 } else {