[129574] trunk/dports/multimedia/ffmpeg

[devans at macports.org]

Revision: 129574
          https://trac.macports.org/changeset/129574
Author:   devans at macports.org
Date:     2014-12-15 14:27:08 -0800 (Mon, 15 Dec 2014)
Log Message:
-----------
ffmpeg: apply upstream patch to fix +gpl3 libsmbclient regression and re-enable libsmbclient support (#46244).

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

Added Paths:
-----------
    trunk/dports/multimedia/ffmpeg/files/patch-libsmbclient.diff

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2014-12-15 20:46:57 UTC (rev 129573)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2014-12-15 22:27:08 UTC (rev 129574)
@@ -11,6 +11,7 @@
 conflicts       ffmpeg-devel
 epoch           1
 version         2.5
+revision        1
 license         LGPL-2.1+
 categories      multimedia
 maintainers     devans jeremyhu openmaintainer
@@ -81,7 +82,8 @@
                 port:xz \
                 port:zlib
 
-patchfiles      patch-libdc1394.diff
+patchfiles      patch-libdc1394.diff \
+                patch-libsmbclient.diff
 
 build.cmd       ${prefix}/bin/gmake
 build.env-append V=1
@@ -253,14 +255,12 @@
 variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+} {
     configure.args-append   --enable-version3 \
                             --enable-libopencore-amrnb \
-                            --enable-libopencore-amrwb
+                            --enable-libopencore-amrwb \
+                            --enable-libsmbclient
 
-#                            --enable-libsmbclient
+    depends_lib-append      port:opencore-amr \
+                            port:samba3
 
-    depends_lib-append      port:opencore-amr
-
-#                            port:samba3
-
     license-delete          LGPL-2.1+
     license-append          GPL-3+
 }

Added: trunk/dports/multimedia/ffmpeg/files/patch-libsmbclient.diff
===================================================================
--- trunk/dports/multimedia/ffmpeg/files/patch-libsmbclient.diff	                        (rev 0)
+++ trunk/dports/multimedia/ffmpeg/files/patch-libsmbclient.diff	2014-12-15 22:27:08 UTC (rev 129574)
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;p=ffmpeg.git;a=blobdiff_plain;f=configure;h=0933210069d9b3e9aa31e89d0a4351e7371d3420;hp=40d5428531f0b709ed14c5df4ab073cd024e5dc2;hb=754f4957d7a7e5be0df0e9de1d31aebeecdc4476;hpb=885e74622e3f3be31aebee35540339c7652e723f
+
+diff --git a/configure b/configure
+index 40d5428..0933210 100755
+--- configure
++++ configure
+@@ -4883,7 +4883,7 @@ enabled libquvi           && require_pkg_config libquvi quvi/quvi.h quvi_init
+ enabled librtmp           && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
+ enabled libschroedinger   && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
+ enabled libshine          && require_pkg_config shine shine/layer3.h shine_encode_buffer
+-enabled libsmbclient      && { check_pkg_config smbclient libsmbclient.h smbc_init ||
++enabled libsmbclient      && { use_pkg_config smbclient libsmbclient.h smbc_init ||
+                                require smbclient libsmbclient.h smbc_init -lsmbclient; }
+ enabled libsoxr           && require libsoxr soxr.h soxr_create -lsoxr
+ enabled libssh            && require_pkg_config libssh libssh/sftp.h sftp_init
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141215/53ce10f8/attachment.html>