[117553] trunk/dports/multimedia/libvpx

3 Mar 2014

Revision: 117553
          https://trac.macports.org/changeset/117553
Author:   devans@macports.org
Date:     2014-03-03 08:52:46 -0800 (Mon, 03 Mar 2014)
Log Message:
-----------
libvpx: assume maintainership, explicitly enable vp9 codec and rebuild, remove unnecessary post-extract phase, reorganize patchfiles, description, license, comments.

Modified Paths:
--------------
    trunk/dports/multimedia/libvpx/Portfile
    trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff

Added Paths:
-----------
    trunk/dports/multimedia/libvpx/files/patch-configure.diff

Removed Paths:
-------------
    trunk/dports/multimedia/libvpx/files/configure.patch

Modified: trunk/dports/multimedia/libvpx/Portfile
===================================================================

--- trunk/dports/multimedia/libvpx/Portfile	2014-03-03 16:50:52 UTC (rev 117552)
+++ trunk/dports/multimedia/libvpx/Portfile	2014-03-03 16:52:46 UTC (rev 117553)
@@ -6,13 +6,21 @@
 
 name                libvpx
 version             1.3.0
+revision            1
 categories          multimedia
-maintainers         nomaintainer
+maintainers         devans openmaintainer
 platforms           darwin
-license             BSD
+license             Permissive
 
-description         VP8 video codec
-long_description    VP8 is a highly efficient video compression technology.
+description         WebM VP8/VP9 Codec SDK
+long_description    The WebM VP8/VP9 codecs are being developed \
+                    specifically to meet the demand for the consumption \
+                    of video over the Internet, including professionally \
+                    and amateur produced video-on-demand and conversational \
+                    video content. VP9 is an evolution of the VP8 video \
+                    codec and includes a number of enhancements and new \
+                    coding tools that have been added to improve coding efficiency. \
+                    The VP9 encoder in this release is not, as yet, feature complete.
 
 homepage            http://webmproject.org
 master_sites        googlecode:webm
@@ -24,28 +32,13 @@
 
 depends_build       port:yasm
 
-post-extract {
-    # Fix incorrect permissions in 1.2.0 tarball
-    # causing files to be installed unreadably
-    # causing other ports needing libvpx to fail to find it.
-    # http://code.google.com/p/webm/issues/detail?id=644
-    fs-traverse item ${worksrcpath} {
-        if {[file isfile ${item}]} {
-            file attributes ${item} -permissions a+r
-        }
-    }
-}
+patchfiles          patch-build-make-configure.sh.diff \
+                    patch-configure.diff
 
-# patches for: 10.6; correct "universal" arch default selection; 'sed' scripts.
-patchfiles          patch-build-make-configure.sh.diff
-
-# Use the correct SDK
-patchfiles-append   configure.patch
-
-
-# As of 0.9.1: doesn't handle shared libraries or debug properly on darwin;
+# As of 1.3.0: doesn't handle shared libraries or debug properly on darwin;
 # doesn't install docs or examples correctly, so disable them.
 configure.args      --enable-vp8 \
+                    --enable-vp9 \
                     --enable-internal-stats \
                     --enable-pic \
                     --enable-postproc \
@@ -108,4 +101,3 @@
         configure.args-append --target=${os.arch}-${os.platform}-gcc
     }
 }
-

Deleted: trunk/dports/multimedia/libvpx/files/configure.patch
===================================================================
--- trunk/dports/multimedia/libvpx/files/configure.patch	2014-03-03 16:50:52 UTC (rev 117552)
+++ trunk/dports/multimedia/libvpx/files/configure.patch	2014-03-03 16:52:46 UTC (rev 117553)
@@ -1,131 +0,0 @@
---- build/make/configure.sh.orig	2014-03-01 22:40:51.000000000 +0100
-+++ build/make/configure.sh	2014-03-01 22:45:39.000000000 +0100
-@@ -634,25 +634,13 @@
- 
-         # detect tgt_os
-         case "$gcctarget" in
--            *darwin8*)
-+            *darwin[89]*)
-                 tgt_isa=universal
--                tgt_os=darwin8
-+                tgt_os=darwin
-                 ;;
--            *darwin9*)
--                tgt_isa=universal
--                tgt_os=darwin9
--                ;;
--            *darwin10*)
--                tgt_isa=x86_64
--                tgt_os=darwin10
--                ;;
--            *darwin11*)
--                tgt_isa=x86_64
--                tgt_os=darwin11
--                ;;
--            *darwin12*)
-+            *darwin*)
-                 tgt_isa=x86_64
--                tgt_os=darwin12
-+                tgt_os=darwin
-                 ;;
-             *darwin13*)
-                 tgt_isa=x86_64
-@@ -709,59 +697,6 @@
-     # PIC is probably what we want when building shared libs
-     enabled shared && soft_enable pic
- 
--    # Handle darwin variants. Newer SDKs allow targeting older
--    # platforms, so find the newest SDK available.
--    case ${toolchain} in
--        *-darwin*)
--            if [ -z "${DEVELOPER_DIR}" ]; then
--                DEVELOPER_DIR=`xcode-select -print-path 2> /dev/null`
--                [ $? -ne 0 ] && OSX_SKIP_DIR_CHECK=1
--            fi
--            if [ -z "${OSX_SKIP_DIR_CHECK}" ]; then
--                OSX_SDK_ROOTS="${DEVELOPER_DIR}/SDKs"
--                OSX_SDK_VERSIONS="MacOSX10.4u.sdk MacOSX10.5.sdk MacOSX10.6.sdk"
--                OSX_SDK_VERSIONS="${OSX_SDK_VERSIONS} MacOSX10.7.sdk"
--                for v in ${OSX_SDK_VERSIONS}; do
--                    if [ -d "${OSX_SDK_ROOTS}/${v}" ]; then
--                        osx_sdk_dir="${OSX_SDK_ROOTS}/${v}"
--                    fi
--                done
--            fi
--            ;;
--    esac
--
--    if [ -d "${osx_sdk_dir}" ]; then
--        add_cflags  "-isysroot ${osx_sdk_dir}"
--        add_ldflags "-isysroot ${osx_sdk_dir}"
--    fi
--
--    case ${toolchain} in
--        *-darwin8-*)
--            add_cflags  "-mmacosx-version-min=10.4"
--            add_ldflags "-mmacosx-version-min=10.4"
--            ;;
--        *-darwin9-*)
--            add_cflags  "-mmacosx-version-min=10.5"
--            add_ldflags "-mmacosx-version-min=10.5"
--            ;;
--        *-darwin10-*)
--            add_cflags  "-mmacosx-version-min=10.6"
--            add_ldflags "-mmacosx-version-min=10.6"
--            ;;
--        *-darwin11-*)
--            add_cflags  "-mmacosx-version-min=10.7"
--            add_ldflags "-mmacosx-version-min=10.7"
--            ;;
--        *-darwin12-*)
--            add_cflags  "-mmacosx-version-min=10.8"
--            add_ldflags "-mmacosx-version-min=10.8"
--            ;;
--        *-darwin13-*)
--            add_cflags  "-mmacosx-version-min=10.9"
--            add_ldflags "-mmacosx-version-min=10.9"
--            ;;
--    esac
--
-     # Handle Solaris variants. Solaris 10 needs -lposix4
-     case ${toolchain} in
-         sparc-solaris-*)
---- configure.orig	2014-01-10 21:12:42.000000000 +0100
-+++ configure	2014-03-01 22:47:49.000000000 +0100
-@@ -102,14 +102,18 @@
- all_platforms="${all_platforms} armv7-win32-vs11"
- all_platforms="${all_platforms} armv7-win32-vs12"
- all_platforms="${all_platforms} mips32-linux-gcc"
-+all_platforms="${all_platforms} ppc32-darwin-gcc"
- all_platforms="${all_platforms} ppc32-darwin8-gcc"
- all_platforms="${all_platforms} ppc32-darwin9-gcc"
- all_platforms="${all_platforms} ppc32-linux-gcc"
-+all_platforms="${all_platforms} ppc64-darwin-gcc"
- all_platforms="${all_platforms} ppc64-darwin8-gcc"
- all_platforms="${all_platforms} ppc64-darwin9-gcc"
- all_platforms="${all_platforms} ppc64-linux-gcc"
- all_platforms="${all_platforms} sparc-solaris-gcc"
- all_platforms="${all_platforms} x86-android-gcc"
-+all_platforms="${all_platforms} x86-darwin-gcc"
-+all_platforms="${all_platforms} x86-darwin-clang"
- all_platforms="${all_platforms} x86-darwin8-gcc"
- all_platforms="${all_platforms} x86-darwin8-icc"
- all_platforms="${all_platforms} x86-darwin9-gcc"
-@@ -129,6 +133,8 @@
- all_platforms="${all_platforms} x86-win32-vs10"
- all_platforms="${all_platforms} x86-win32-vs11"
- all_platforms="${all_platforms} x86-win32-vs12"
-+all_platforms="${all_platforms} x86_64-darwin-gcc"
-+all_platforms="${all_platforms} x86_64-darwin-clang"
- all_platforms="${all_platforms} x86_64-darwin9-gcc"
- all_platforms="${all_platforms} x86_64-darwin10-gcc"
- all_platforms="${all_platforms} x86_64-darwin11-gcc"
-@@ -143,6 +149,8 @@
- all_platforms="${all_platforms} x86_64-win64-vs10"
- all_platforms="${all_platforms} x86_64-win64-vs11"
- all_platforms="${all_platforms} x86_64-win64-vs12"
-+all_platforms="${all_platforms} universal-darwin-gcc"
-+all_platforms="${all_platforms} universal-darwin-clang"
- all_platforms="${all_platforms} universal-darwin8-gcc"
- all_platforms="${all_platforms} universal-darwin9-gcc"
- all_platforms="${all_platforms} universal-darwin10-gcc"

Modified: trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff
===================================================================
--- trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff	2014-03-03 16:50:52 UTC (rev 117552)
+++ trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff	2014-03-03 16:52:46 UTC (rev 117553)
@@ -1,15 +1,109 @@
---- build/make/configure.sh.orig	2014-03-01 22:40:06.000000000 +0100
-+++ build/make/configure.sh	2014-03-01 22:40:16.000000000 +0100
+--- build/make/configure.sh.orig	2014-03-01 21:31:44.000000000 -0800
++++ build/make/configure.sh	2014-03-01 21:38:15.000000000 -0800
 @@ -442,10 +442,10 @@
  EOF
  
      if enabled rvct; then cat >> $1 << EOF
 -fmt_deps = sed -e 's;^__image.axf;\${@:.d=.o} \$@;' #hide
-+fmt_deps = sed -e 's;^__image.axf\$\$;\${@:.d=.o} \$@;' #hide
++fmt_deps = sed -e 's;^__image.axf;\$\${@:.d=.o} \$@;' #hide
  EOF
      else cat >> $1 << EOF
 -fmt_deps = sed -e 's;^\([a-zA-Z0-9_]*\)\.o;\${@:.d=.o} \$@;'
-+fmt_deps = sed -e 's;^\([a-zA-Z0-9_]*\)\.o\$\$;\${@:.d=.o} \$@;'
++fmt_deps = sed -e 's;^\([a-zA-Z0-9_]*\)\.o;\$\${@:.d=.o} \$@;'
  EOF
      fi
  
+@@ -634,29 +634,13 @@
+ 
+         # detect tgt_os
+         case "$gcctarget" in
+-            *darwin8*)
++            *darwin[89]*)
+                 tgt_isa=universal
+-                tgt_os=darwin8
++                tgt_os=darwin
+                 ;;
+-            *darwin9*)
+-                tgt_isa=universal
+-                tgt_os=darwin9
+-                ;;
+-            *darwin10*)
+-                tgt_isa=x86_64
+-                tgt_os=darwin10
+-                ;;
+-            *darwin11*)
+-                tgt_isa=x86_64
+-                tgt_os=darwin11
+-                ;;
+-            *darwin12*)
++            *darwin*)
+                 tgt_isa=x86_64
+-                tgt_os=darwin12
+-                ;;
+-            *darwin13*)
+-                tgt_isa=x86_64
+-                tgt_os=darwin13
++                tgt_os=darwin
+                 ;;
+             x86_64*mingw32*)
+                 tgt_os=win64
+@@ -709,59 +693,6 @@
+     # PIC is probably what we want when building shared libs
+     enabled shared && soft_enable pic
+ 
+-    # Handle darwin variants. Newer SDKs allow targeting older
+-    # platforms, so find the newest SDK available.
+-    case ${toolchain} in
+-        *-darwin*)
+-            if [ -z "${DEVELOPER_DIR}" ]; then
+-                DEVELOPER_DIR=`xcode-select -print-path 2> /dev/null`
+-                [ $? -ne 0 ] && OSX_SKIP_DIR_CHECK=1
+-            fi
+-            if [ -z "${OSX_SKIP_DIR_CHECK}" ]; then
+-                OSX_SDK_ROOTS="${DEVELOPER_DIR}/SDKs"
+-                OSX_SDK_VERSIONS="MacOSX10.4u.sdk MacOSX10.5.sdk MacOSX10.6.sdk"
+-                OSX_SDK_VERSIONS="${OSX_SDK_VERSIONS} MacOSX10.7.sdk"
+-                for v in ${OSX_SDK_VERSIONS}; do
+-                    if [ -d "${OSX_SDK_ROOTS}/${v}" ]; then
+-                        osx_sdk_dir="${OSX_SDK_ROOTS}/${v}"
+-                    fi
+-                done
+-            fi
+-            ;;
+-    esac
+-
+-    if [ -d "${osx_sdk_dir}" ]; then
+-        add_cflags  "-isysroot ${osx_sdk_dir}"
+-        add_ldflags "-isysroot ${osx_sdk_dir}"
+-    fi
+-
+-    case ${toolchain} in
+-        *-darwin8-*)
+-            add_cflags  "-mmacosx-version-min=10.4"
+-            add_ldflags "-mmacosx-version-min=10.4"
+-            ;;
+-        *-darwin9-*)
+-            add_cflags  "-mmacosx-version-min=10.5"
+-            add_ldflags "-mmacosx-version-min=10.5"
+-            ;;
+-        *-darwin10-*)
+-            add_cflags  "-mmacosx-version-min=10.6"
+-            add_ldflags "-mmacosx-version-min=10.6"
+-            ;;
+-        *-darwin11-*)
+-            add_cflags  "-mmacosx-version-min=10.7"
+-            add_ldflags "-mmacosx-version-min=10.7"
+-            ;;
+-        *-darwin12-*)
+-            add_cflags  "-mmacosx-version-min=10.8"
+-            add_ldflags "-mmacosx-version-min=10.8"
+-            ;;
+-        *-darwin13-*)
+-            add_cflags  "-mmacosx-version-min=10.9"
+-            add_ldflags "-mmacosx-version-min=10.9"
+-            ;;
+-    esac
+-
+     # Handle Solaris variants. Solaris 10 needs -lposix4
+     case ${toolchain} in
+         sparc-solaris-*)

Added: trunk/dports/multimedia/libvpx/files/patch-configure.diff
===================================================================
--- trunk/dports/multimedia/libvpx/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/multimedia/libvpx/files/patch-configure.diff	2014-03-03 16:52:46 UTC (rev 117553)
@@ -0,0 +1,41 @@
+--- configure.orig	2014-01-10 12:12:42.000000000 -0800
++++ configure	2014-03-01 21:48:09.000000000 -0800
+@@ -104,9 +104,11 @@
+ all_platforms="${all_platforms} mips32-linux-gcc"
+ all_platforms="${all_platforms} ppc32-darwin8-gcc"
+ all_platforms="${all_platforms} ppc32-darwin9-gcc"
++all_platforms="${all_platforms} ppc32-darwin-gcc"
+ all_platforms="${all_platforms} ppc32-linux-gcc"
+ all_platforms="${all_platforms} ppc64-darwin8-gcc"
+ all_platforms="${all_platforms} ppc64-darwin9-gcc"
++all_platforms="${all_platforms} ppc64-darwin-gcc"
+ all_platforms="${all_platforms} ppc64-linux-gcc"
+ all_platforms="${all_platforms} sparc-solaris-gcc"
+ all_platforms="${all_platforms} x86-android-gcc"
+@@ -118,6 +120,8 @@
+ all_platforms="${all_platforms} x86-darwin11-gcc"
+ all_platforms="${all_platforms} x86-darwin12-gcc"
+ all_platforms="${all_platforms} x86-darwin13-gcc"
++all_platforms="${all_platforms} x86-darwin-gcc"
++all_platforms="${all_platforms} x86-darwin-clang"
+ all_platforms="${all_platforms} x86-linux-gcc"
+ all_platforms="${all_platforms} x86-linux-icc"
+ all_platforms="${all_platforms} x86-os2-gcc"
+@@ -134,6 +138,8 @@
+ all_platforms="${all_platforms} x86_64-darwin11-gcc"
+ all_platforms="${all_platforms} x86_64-darwin12-gcc"
+ all_platforms="${all_platforms} x86_64-darwin13-gcc"
++all_platforms="${all_platforms} x86_64-darwin-gcc"
++all_platforms="${all_platforms} x86_64-darwin-clang"
+ all_platforms="${all_platforms} x86_64-linux-gcc"
+ all_platforms="${all_platforms} x86_64-linux-icc"
+ all_platforms="${all_platforms} x86_64-solaris-gcc"
+@@ -149,6 +155,8 @@
+ all_platforms="${all_platforms} universal-darwin11-gcc"
+ all_platforms="${all_platforms} universal-darwin12-gcc"
+ all_platforms="${all_platforms} universal-darwin13-gcc"
++all_platforms="${all_platforms} universal-darwin-gcc"
++all_platforms="${all_platforms} universal-darwin-clang"
+ all_platforms="${all_platforms} generic-gnu"
+ 
+ # all_targets is a list of all targets that can be configured

    

[117553] trunk/dports/multimedia/libvpx

devans＠macports.org