Ticket #47907: libvpx-1.4.0-ryandesign3.diff

File libvpx-1.4.0-ryandesign3.diff, 3.5 KB (added by ryandesign (Ryan Schmidt), 6 years ago)
  • Portfile

     
    55PortGroup           compiler_blacklist_versions 1.0
    66PortGroup           muniversal 1.0
    77
     8# Since libvpx installs a static library only, increase the revision of
     9# dependents when updating libvpx to a new version so they'll be rebuilt.
    810name                libvpx
    9 version             1.3.0
    10 revision            1
     11version             1.4.0
    1112categories          multimedia
    1213maintainers         devans openmaintainer
    1314platforms           darwin
     
    2425                    The VP9 encoder in this release is not, as yet, feature complete.
    2526
    2627homepage            http://webmproject.org
    27 master_sites        googlecode:webm
     28master_sites        http://storage.googleapis.com/downloads.webmproject.org/releases/webm/
    2829use_bzip2           yes
    29 distname            ${name}-v${version}
    3030
    31 checksums           rmd160  bf74821ac8f20ed30f44b6e01473ee1f332f721c \
    32                     sha256  d3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9
     31checksums           rmd160  272b1a9f1687a80337d79ccbada2a344c96d1bf1 \
     32                    sha256  f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4
    3333
    3434if {[string match "*86*" [get_canonical_archs]]} {
    3535    depends_build-append port:yasm
     
    5252                    --enable-runtime-cpu-detect \
    5353                    --disable-install-docs \
    5454                    --disable-debug-libs \
    55                     --disable-examples
     55                    --disable-examples \
     56                    --disable-unit-tests
    5657
    5758configure.env       LD="${configure.cc}"
    5859
     
    8586        build.args-append CFLAGS_S=-fno-integrated-as
    8687}
    8788
    88 platform darwin {
    89     if {${os.major} >= 10} {
    90         supported_archs i386 x86_64
    91     }
    92 }
     89configure.universal_args-delete --disable-dependency-tracking
    9390
    94 # set configure parameters depending on if universal or not
    9591set my_targets(ppc)     ppc32
    9692set my_targets(ppc64)   ppc64
    9793set my_targets(i386)    x86
    9894set my_targets(x86_64)  x86_64
    99 if {[variant_isset universal]} {
    100     # clear universal flags; configure will determine them.
    101     configure.universal_cppflags
    102     configure.universal_cflags
    103     configure.universal_cxxflags
    104     configure.universal_ldflags
    105     configure.universal_args-delete --disable-dependency-tracking
    106     foreach my_arch ${configure.universal_archs} {
    107         set merger_host(${my_arch}) ""
    108         if {[info exists my_targets(${my_arch})]} {
    109             set merger_configure_args(${my_arch}) --target=$my_targets(${my_arch})-${os.platform}-gcc
    110         }
     95
     96# We must specify the target, otherwise the configure script will guess,
     97# and that may not match what the user requested in macports.conf.
     98foreach my_arch ${configure.universal_archs} {
     99    set merger_host(${my_arch}) ""
     100    if {[info exists my_targets(${my_arch})]} {
     101        set merger_configure_args(${my_arch}) --target=$my_targets(${my_arch})-${os.platform}-gcc
    111102    }
    112 } else {
    113     # specify only the single target, otherwise 'configure' will try
    114     # for a universal install.
    115     if {[info exists my_targets(${build_arch})]} {
    116         configure.args-append --target=$my_targets(${build_arch})-${os.platform}-gcc
     103}
     104if {![variant_isset universal]} {
     105    if {[info exists merger_configure_args(${build_arch})]} {
     106        configure.args-append $merger_configure_args(${build_arch})
    117107    } else {
    118108        configure.args-append --target=${os.arch}-${os.platform}-gcc
    119109    }