[132567] trunk/dports

4 Feb 2015

Revision: 132567
          https://trac.macports.org/changeset/132567
Author:   larryv@macports.org
Date:     2015-02-04 13:50:27 -0800 (Wed, 04 Feb 2015)
Log Message:
-----------
HandBrake: Switch primary category to "multimedia"

The Mac GUI is not the only interface.

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

Added Paths:
-----------
    trunk/dports/multimedia/HandBrake/

Removed Paths:
-------------
    trunk/dports/aqua/HandBrake/

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

--- trunk/dports/aqua/HandBrake/Portfile	2015-02-04 21:10:34 UTC (rev 132566)
+++ trunk/dports/multimedia/HandBrake/Portfile	2015-02-04 21:50:27 UTC (rev 132567)
@@ -2,12 +2,11 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           python 1.0
 
 name                HandBrake
-version             0.9.8
+version             0.9.9
+categories          multimedia aqua
 platforms           macosx
-categories          aqua multimedia
 maintainers         nomaintainer
 license             GPL-2
 
@@ -17,7 +16,9 @@
                     widely supported codecs.
 homepage            http://handbrake.fr/
 
-depends_build       port:autoconf \
+# OS X 10.6 and newer come with Python 2.5.
+depends_build       bin:python2.5:python27 \
+                    port:autoconf \
                     port:automake \
                     port:libtool \
                     port:yasm
@@ -30,20 +31,20 @@
 }
 
 use_bzip2           yes
-master_sites        http://handbrake.fr/rotation.php?file=${distname}${extract.suffix}&dummy=:src \
+master_sites        sourceforge:project/handbrake/${version}/:src \
                     http://download.handbrake.fr/handbrake/contrib/:contrib
 distfiles           ${distname}${extract.suffix}:src \
                     a52dec-0.7.4.tar.gz:contrib \
                     faac-1.28.tar.gz:contrib \
                     faad2-2.7.tar.gz:contrib \
-                    ffmpeg-v0.7-1696-gcae4f4b.tar.bz2:contrib \
+                    fdk-aac-v0.1.1-6-gbae4553.tar.bz2:contrib \
                     fontconfig-2.8.0.tar.gz:contrib \
                     freetype-2.4.7.tar.bz2:contrib \
                     fribidi-0.19.2.tar.gz:contrib \
                     lame-3.98.tar.gz:contrib \
                     libass-0.10.0-1.tar.gz:contrib \
-                    libbluray-0.0.1-pre-213-ga869da8.tar.gz:contrib \
-                    libdca-r81-strapped.tar.gz:contrib \
+                    libav-v9.6.tar.bz2:contrib \
+                    libbluray-0.2.3.tar.bz2:contrib \
                     libdvdnav-svn1168.tar.gz:contrib \
                     libdvdread-svn1168.tar.gz:contrib \
                     libmkv-0.6.5-0-g82075ae.tar.gz:contrib \
@@ -54,11 +55,11 @@
                     libxml2-2.7.7.tar.gz:contrib \
                     mp4v2-trunk-r355.tar.bz2:contrib \
                     mpeg2dec-0.5.1.tar.gz:contrib \
-                    x264-r2146-bcd41db.tar.gz:contrib
+                    x264-r2273-b3065e6.tar.gz:contrib
 
-checksums           HandBrake-0.9.8.tar.bz2 \
-                        rmd160  7392fa8783f8b114bf0cdc4adc6b96d148f75e09 \
-                        sha256  dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798 \
+checksums           HandBrake-0.9.9.tar.bz2 \
+                        rmd160  e1422f9454ae2027962aefe5e87909c8b533bf16 \
+                        sha256  a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3 \
                     a52dec-0.7.4.tar.gz \
                         rmd160  5f8ff682a43ffdafdb88a4231bfa64bb40f138d8 \
                         sha256  54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47 \
@@ -68,30 +69,30 @@
                     faad2-2.7.tar.gz \
                         rmd160  3f0ca461e2953014d5b17edccb3337767d478b8d \
                         sha256  ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 \
-                    ffmpeg-v0.7-1696-gcae4f4b.tar.bz2 \
-                        rmd160  351d04575a50c042fe042c85b1feccd045a8804e \
-                        sha256  f39b2ea8f47db9c84c9bb091707312cd19b927d8f4a957c20222add1a5dd2497 \
-                    fribidi-0.19.2.tar.gz \
-                        rmd160  4fafb4b3140bbbcf4c2c58c714b02db2d71e5491 \
-                        sha256  49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177 \
+                    fdk-aac-v0.1.1-6-gbae4553.tar.bz2 \
+                        rmd160  608d8b8028b33a8ebcbf3e5d52f3c778dd52768b \
+                        sha256  f08584d59a02db5facf548ae860c64d2870db63477f605af763c161a1508dcbc \
                     fontconfig-2.8.0.tar.gz \
                         rmd160  fefee412cad4fa71b573e997e14f1df12f439be2 \
                         sha256  fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335 \
                     freetype-2.4.7.tar.bz2 \
                         rmd160  48abfcd4546cbd6626796ab121252e804ddcc6d8 \
                         sha256  ba22620479954582371286268ef75e6e932c0270ee67d6797bbf3ed9d31a5d77 \
+                    fribidi-0.19.2.tar.gz \
+                        rmd160  4fafb4b3140bbbcf4c2c58c714b02db2d71e5491 \
+                        sha256  49cf91586e48b52fe25872ff66c1da0dff0daac2593f9f300e2af12f44f64177 \
                     lame-3.98.tar.gz \
                         rmd160  c10c20128622e16f9cac3d346bea8e390e4bfdc5 \
                         sha256  40235e84dfe4760ad3f352590a64b7bda1502a386c97d06229df356426e37686 \
                     libass-0.10.0-1.tar.gz \
                         rmd160  da29a27a4ae107629d0ea6dd7ec21f1d36167b16 \
                         sha256  a0c652f4a5c1bfd58cd47ff627fff2dfbd471b40f765aa96fd1b251c0058b867 \
-                    libbluray-0.0.1-pre-213-ga869da8.tar.gz \
-                        rmd160  77ea3b642fa1b58fe3acef32ee457173586ed403 \
-                        sha256  4aa7127201a5d3d4148d99c37c7701ede6e0707456dacc8a59464dc68e231b76 \
-                    libdca-r81-strapped.tar.gz \
-                        rmd160  f8af6ac0df89e221d0b95caf68ee3aa3904ab178 \
-                        sha256  ab2519af6c2f12411a2bd674b83615af9b0d5fb09f28ad5dab714ea1bfab9df1 \
+                    libav-v9.6.tar.bz2 \
+                        rmd160  0dca69414470e403fad5df9257fc316ce17c2f57 \
+                        sha256  ea41941866fb64d7e363684a4705574f65786bd9eb0fe1f796dee4c0d459aa52 \
+                    libbluray-0.2.3.tar.bz2 \
+                        rmd160  6f0444ace7b7ceebd2bf21ddda73cfe5cd743443 \
+                        sha256  2c65cfb02aeec31721f9ea65ee2c085a9bfe163e99dd01b52ccb3f53ba205eea \
                     libdvdnav-svn1168.tar.gz \
                         rmd160  9628b3cf9cf29bf617047da6c387552d35de5e3d \
                         sha256  7cf4ff6ab0b5d3db3c300fc3cdb24e1ad59f22dd90352df075a604bc698d01c7 \
@@ -122,76 +123,66 @@
                     mpeg2dec-0.5.1.tar.gz \
                         rmd160  3986798a30b33e689b1d7c5390380c13b74f8c76 \
                         sha256  161539061aa89864968a5150ed6c6a028a830c4868f7dd7c500732baef47fb71 \
-                    x264-r2146-bcd41db.tar.gz \
-                        rmd160  9747178126c529c4bc807de356b57c077c95285b \
-                        sha256  7b3d0ad309426ad49ff21df4d2ee5553b5769bc2bf2b7ae50f37f5fc72d190b1
+                    x264-r2273-b3065e6.tar.gz \
+                        rmd160  763c277606f17061ca799a60c0635966f488851d \
+                        sha256  956c82c9318740ef3744cf6e752fb6181be0716273e2e8976306624f0864a815
 
-variant python26 conflicts python27 description {Use Python 2.6} {
-    python.default_version 26
-}
-
-variant python27 conflicts python26 description {Use Python 2.7} {
-    python.default_version 27
-}
-
-if {![variant_isset python26] && ![variant_isset python27]} {
-    default_variants +python27
-}
-
 extract.only        ${distname}${extract.suffix}
 post-extract {
     file mkdir ${worksrcpath}/download
-    foreach distfile ${distfiles} {
-        if {[regexp {^(.+):([^:]+)} ${distfile} -> distfilename distfiletag]} {
-            if {${distfiletag} == "contrib"} {
-                copy ${distpath}/${distfilename} ${worksrcpath}/download
-            }
-        }
+
+    # Assume that the HandBrake source is first element in distfiles.
+    foreach distfile [lrange ${distfiles} 1 end] {
+        copy ${distpath}/[getdistname ${distfile}] ${worksrcpath}/download
     }
+}
 
-    # make mp4v2 build with clang, see
+patchfiles          missing-delegate.patch
+post-patch {
+    # mp4v2: fix build with clang, see
     # http://code.google.com/p/mp4v2/issues/detail?id=80
-    file copy ${filespath}/mp4v2-r355-clang-compatibility-src-bmff-typebmff.cpp.patch \
-        ${worksrcpath}/contrib/mp4v2/A01-clang-compatibility.patch
-    file copy ${filespath}/mp4v2-r355-clang-compatibility-src-itmf-type.cpp.patch \
-        ${worksrcpath}/contrib/mp4v2/A02-clang-compatibility.patch
-    # make ffmpeg build with jack support on OS X, see
+    copy ${filespath}/mp4v2-r355-clang-compatibility-src-bmff-typebmff.cpp.patch \
+        ${worksrcpath}/contrib/mp4v2/A03-clang-compatibility.patch
+    copy ${filespath}/mp4v2-r355-clang-compatibility-src-itmf-type.cpp.patch \
+        ${worksrcpath}/contrib/mp4v2/A04-clang-compatibility.patch
+
+    # ffmpeg: build with jack support on OS X, see
     # http://ffmpeg.org/trac/ffmpeg/ticket/43
-    file copy ${filespath}/ffmpeg-jack-osx.patch \
-        ${worksrcpath}/contrib/ffmpeg/A06-jack-osx.patch
+    #copy ${filespath}/ffmpeg-jack-osx.patch \
+    #    ${worksrcpath}/contrib/ffmpeg/A06-jack-osx.patch
 
-    # Fix missing <Carbon.h>
-    file copy ${filespath}/libsamplerate-carbon.patch \
-        ${worksrcpath}/contrib/libsamplerate/A01-libsamplerate-carbon.patch
+    # libsamplerate: Fix missing <Carbon.h>
+    copy ${filespath}/libsamplerate-carbon.patch \
+        ${worksrcpath}/contrib/libsamplerate/A00-libsamplerate-carbon.patch
 }
 
-patchfiles          missing-delegate.patch
-
-# the Python PortGroup disables configure, we still want to use it, though
-use_configure       yes
-pre-configure {
-    # this needs to be set in a phase, since setting it without a phase will not
-    # give the correct python version selected by the variants
-    configure.cmd   ${python.bin} make/configure.py
+# XXX: Not sure if enabling fdk-aac affects license.
+configure.pre_args  --prefix=${destroot}${applications_dir}
+configure.args      --arch=${configure.build_arch} \
+                    --enable-fdk-aac \
+                    --gcc=${configure.cc} \
+                    --libtool=${prefix}/bin/glibtool \
+                    --m4=${prefix}/bin/gm4 \
+                    --verbose
+set opt [lindex [lsearch -all -inline ${configure.optflags} {-O*}] end]
+switch -glob -- ${opt} {
+    -Ofast  -
+    -O[34]  {configure.args-append  --optimize=speed}
+    -O[sz]  {configure.args-append  --optimize=size}
+    default {configure.args-append  --optimize=none}
 }
-configure.pre_args
-configure.args      --fetch=curl \
-                    --curl=false \
-                    --arch=${configure.build_arch} \
-                    --gcc=${configure.cc}
 
 # +universal would be possible, but not implemented yet
 # see ${worksrcpath}/doc/BUILD-Mac for details
 universal_variant   no
 
-build.cmd           [portbuild::build_getmaketype]
+build.type          gnu
 build.dir           ${worksrcpath}/build
-build.target
+build.target        build
 
 destroot {
-    file copy ${worksrcpath}/build/xroot/${name}.app \
-        ${destroot}${applications_dir}/${name}.app
+    copy ${worksrcpath}/build/xroot/${name}.app \
+        ${destroot}${applications_dir}
 }
 
-livecheck.url       http://sourceforge.net/projects/handbrake/files/
-livecheck.regex     "handbrake\/files\/(\\d+(?:\\.\\d+)*)"
+livecheck.regex     {/files/([.\d]+)/}

    

larryv＠macports.org

tags

participants (1)