[92709] trunk/dports/multimedia/VLC
jeremyhu at macports.org
jeremyhu at macports.org
Fri May 4 01:45:25 PDT 2012
Revision: 92709
https://trac.macports.org/changeset/92709
Author: jeremyhu at macports.org
Date: 2012-05-04 01:45:21 -0700 (Fri, 04 May 2012)
Log Message:
-----------
VLC: Fix the supported_archs to be for Leopard, not SL ... also switch to the correct repo for the 2.0 branch
Modified Paths:
--------------
trunk/dports/multimedia/VLC/Portfile
trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch
Modified: trunk/dports/multimedia/VLC/Portfile
===================================================================
--- trunk/dports/multimedia/VLC/Portfile 2012-05-04 08:16:14 UTC (rev 92708)
+++ trunk/dports/multimedia/VLC/Portfile 2012-05-04 08:45:21 UTC (rev 92709)
@@ -5,6 +5,7 @@
name VLC
version 2.0.1
+revision 1
categories multimedia
@@ -26,8 +27,8 @@
# https://trac.videolan.org/vlc/ticket/6739
# https://trac.videolan.org/vlc/ticket/6743
fetch.type git
-git.url git://git.videolan.org/vlc.git
-git.branch 2eab05e34ae0f580c25fde33c183bd9737c8aa3f
+git.url git://git.videolan.org/vlc/vlc-2.0.git
+git.branch d538309b82af1610760681044a65083355c9aa58
#master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
#distname vlc-${version}
@@ -60,31 +61,8 @@
no-sparkle.patch
post-patch {
- reinplace "/Sparkle.framework/d" \
- ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
- reinplace "/SDKROOT/d" \
- ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
- reinplace "/Growl.framework/d" \
- ${worksrcpath}/extras/package/macosx/package.mak
-
- reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \
- ${worksrcpath}/Makefile.am
-
- reinplace "/argv/s/environ/*_NSGetEnviron()/" \
- ${worksrcpath}/modules/misc/inhibit/xdg.c \
- ${worksrcpath}/modules/misc/inhibit/xscreensaver.c
-
- reinplace "s/extern char \\*\\*environ;/#include <crt_externs.h>/" \
- ${worksrcpath}/modules/misc/inhibit/xdg.c \
- ${worksrcpath}/modules/misc/inhibit/xscreensaver.c
-
reinplace "s:librsvg-2/librsvg:librsvg:" \
${worksrcpath}/modules/text_renderer/svg.c
-
- ln -s ${frameworks_dir}/BGHUDAppKit.framework ${worksrcpath}/contrib/BGHUDAppKit.framework
-
- # To trick configure
- file mkdir "${worksrcpath}/contrib/lib"
}
pre-configure {
@@ -346,8 +324,8 @@
default_variants-append +qtkit
}
- if {${os.major} == 10} {
- # FIXME: x86_64 segfaults on Leopard ... dunno why
+ if {${os.major} == 9} {
+ # FIXME: x86_64 segfaults on Leopard on dlclose() ... not sure why
supported_archs i386 ppc
}
@@ -363,6 +341,31 @@
configure.args-append --enable-macosx-vlc-app
}
+ post-patch {
+ reinplace "/Sparkle.framework/d" \
+ ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+ reinplace "/SDKROOT/d" \
+ ${worksrcpath}/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+ reinplace "/Growl.framework/d" \
+ ${worksrcpath}/extras/package/macosx/package.mak
+
+ reinplace "s:LD_LIBRARY_PATH:DYLD_LIBRARY_PATH:g" \
+ ${worksrcpath}/Makefile.am
+
+ reinplace "/argv/s/environ/*_NSGetEnviron()/" \
+ ${worksrcpath}/modules/misc/inhibit/xdg.c \
+ ${worksrcpath}/modules/misc/inhibit/xscreensaver.c
+
+ reinplace "s/extern char \\*\\*environ;/#include <crt_externs.h>/" \
+ ${worksrcpath}/modules/misc/inhibit/xdg.c \
+ ${worksrcpath}/modules/misc/inhibit/xscreensaver.c
+
+ ln -s ${frameworks_dir}/BGHUDAppKit.framework ${worksrcpath}/contrib/BGHUDAppKit.framework
+
+ # To trick configure
+ file mkdir "${worksrcpath}/contrib/lib"
+ }
+
post-destroot {
eval file delete [glob ${destroot}${prefix}/lib/vlc/plugins/*.la]
Modified: trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch
===================================================================
--- trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch 2012-05-04 08:16:14 UTC (rev 92708)
+++ trunk/dports/multimedia/VLC/files/configure.ac-no-arch.patch 2012-05-04 08:45:21 UTC (rev 92709)
@@ -1,6 +1,6 @@
---- configure.ac.orig 2012-05-03 18:38:38.000000000 -0700
-+++ configure.ac 2012-05-03 18:40:40.000000000 -0700
-@@ -126,35 +126,11 @@ case "${host_os}" in
+--- configure.ac.orig 2012-05-04 00:32:07.000000000 -0700
++++ configure.ac 2012-05-04 00:37:57.000000000 -0700
+@@ -134,30 +134,12 @@ case "${host_os}" in
SYS=dragonfly
;;
darwin*)
@@ -20,23 +20,19 @@
- x86_64*)
- ARCH_flag="-arch x86_64"
- ;;
-- arm*)
-- ARCH_flag="-arch armv7"
-- ac_cv_c_bigendian="no"
-- ac_cv_c_attribute_packed="no"
-- ;;
- esac
-
SYS=darwin
-- CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
-- CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
-- CPPFLAGS="${CPPFLAGS} ${ARCH_flag}"
-- OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}"
-- LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
-+ CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS"
-+ CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS"
-+ OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99"
-+ LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
+- CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"; CFLAGS="${CFLAGS_save}"
+- CXXFLAGS_save="${CXXFLAGS_save} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"; CXXFLAGS="${CXXFLAGS_save}"
+- CPPFLAGS_save="${CPPFLAGS_save} ${ARCH_flag}"; CPPFLAGS="${CPPFLAGS_save}"
+- OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}"; OBJCFLAGS="${OBJCFLAGS_save}"
+- LDFLAGS_save="${LDFLAGS_save} -Wl,-headerpad_max_install_names ${ARCH_flag}"; LDFLAGS="${LDFLAGS_save}"
++ CFLAGS_save="${CFLAGS_save} -D_INTL_REDIRECT_MACROS"; CFLAGS="${CFLAGS_save}"
++ CXXFLAGS_save="${CXXFLAGS_save} -D_INTL_REDIRECT_MACROS"; CXXFLAGS="${CXXFLAGS_save}"
++ CPPFLAGS_save="${CPPFLAGS_save}"; CPPFLAGS="${CPPFLAGS_save}"
++ OBJCFLAGS_save="${OBJCFLAGS_save} -D_INTL_REDIRECT_MACROS -std=gnu99"; OBJCFLAGS="${OBJCFLAGS_save}"
++ LDFLAGS_save="${LDFLAGS_save} -Wl,-headerpad_max_install_names"; LDFLAGS="${LDFLAGS_save}"
VLC_ADD_LIBS([mkv mp4 motion], [-Wl,-framework,IOKit,-framework,CoreFoundation])
VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup])
- VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress])
+ VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264],[-Wl,-read_only_relocs,suppress])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120504/ea57a893/attachment.html>
More information about the macports-changes
mailing list