Changeset 88444 for trunk/dports/aqua


Ignore:
Timestamp:
Jan 2, 2012, 5:12:32 PM (8 years ago)
Author:
cal@…
Message:

HandBrake: Make python version configurable, make sure we're UsingTheRightCompiler, fix two issues with clang/OS X compatibility, closes #30863

Location:
trunk/dports/aqua/HandBrake
Files:
4 added
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/HandBrake/Portfile

    r88443 r88444  
    22# $Id$
    33
    4 PortSystem 1.0
     4PortSystem      1.0
     5PortGroup       python 1.0
    56
    67name            HandBrake
     
    7475                x264-r1834-a51816a.tar.gz sha1 33028199108ed71cb4f1b5ae755ef8a2e5f6e7d3
    7576
    76 depends_build   port:python26 \
    77                 bin:curl:curl \
     77variant python26 conflicts python27 {
     78    python.default_version 26
     79}
     80
     81variant python27 conflicts python26 {
     82    python.default_version 27
     83}
     84
     85if {![variant_isset python27]} {
     86    default_variants +python26
     87}
     88
     89
     90depends_build   bin:curl:curl \
    7891                port:yasm
    79 set python.bin  ${prefix}/bin/python2.6
    8092
    8193post-extract {
     
    106118}
    107119
    108 configure.cmd   ${python.bin} make/configure.py
     120post-extract {
     121    # make mp4v2 build with clang, see http://code.google.com/p/mp4v2/issues/detail?id=80
     122    file copy ${filespath}/mp4v2-r355-clang-compatibility-src-bmff-typebmff.cpp.patch \
     123        ${worksrcpath}/contrib/mp4v2/A01-clang-compatibility.patch
     124    file copy ${filespath}/mp4v2-r355-clang-compatibility-src-itmf-type.cpp.patch \
     125        ${worksrcpath}/contrib/mp4v2/A02-clang-compatibility.patch
     126    # make ffmpeg build with jack support on OS X, see http://ffmpeg.org/trac/ffmpeg/ticket/43
     127    file copy ${filespath}/ffmpeg-jack-osx.patch \
     128        ${worksrcpath}/contrib/ffmpeg/A06-jack-osx.patch
     129}
     130
     131# the Python PortGroup disables configure, we still want to use it, though
     132use_configure       yes
     133pre-configure {
     134    # this needs to be set in a phase, since setting it without a phase will not
     135    # give the correct python version selected by the variants
     136    configure.cmd   ${python.bin} make/configure.py
     137}
    109138configure.pre_args
    110 configure.args  --fetch=curl --arch=${configure.build_arch}
     139configure.args      --fetch=curl --arch=${configure.build_arch} --gcc=${configure.compiler}
    111140
    112141# +universal would be possible, but not implemented yet
    113142# see ${worksrcpath}/doc/BUILD-Mac for details
    114 universal_variant no
     143universal_variant   no
    115144
     145build.cmd [portbuild::build_getmaketype]
    116146build.dir ${worksrcpath}/build
    117147build.target
Note: See TracChangeset for help on using the changeset viewer.