[111643] trunk/dports/multimedia/VLC-devel
jeremyhu at macports.org
jeremyhu at macports.org
Fri Sep 27 14:07:32 PDT 2013
Revision: 111643
https://trac.macports.org/changeset/111643
Author: jeremyhu at macports.org
Date: 2013-09-27 14:07:32 -0700 (Fri, 27 Sep 2013)
Log Message:
-----------
VLC-devel: Bump to current git master
Modified Paths:
--------------
trunk/dports/multimedia/VLC-devel/Portfile
trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch
trunk/dports/multimedia/VLC-devel/files/qtkit.patch
Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile 2013-09-27 21:04:04 UTC (rev 111642)
+++ trunk/dports/multimedia/VLC-devel/Portfile 2013-09-27 21:07:32 UTC (rev 111643)
@@ -5,8 +5,8 @@
PortGroup compiler_blacklist_versions 1.0
name VLC-devel
-version 2.0.99
-revision 24
+version 2.1.99
+revision 0
categories multimedia
@@ -27,9 +27,9 @@
# http://git.videolan.org/?p=vlc.git
# http://git.videolan.org/?p=vlc.git;a=forks
fetch.type git
-git.url git://git.videolan.org/vlc/vlc-2.1.git
-#git.url git://git.videolan.org/vlc.git
-git.branch 624962be26277cc6c70f2c13b32c81d1eb7a45f8
+#git.url git://git.videolan.org/vlc/vlc-2.1.git
+git.url git://git.videolan.org/vlc.git
+git.branch 18cbe9639c57d5d3cc676909c64acd89997bcac3
#master_sites http://download.videolan.org/pub/videolan/vlc/${version}/
#distname vlc-${version}
@@ -52,7 +52,7 @@
port:avahi path:lib/libavcodec.dylib:ffmpeg \
port:openjpeg15 port:libbluray port:libgcrypt
-# TODO: port:live555
+# TODO: live555 opencv FreeRDP
# VLC-2.1 and later are x86_64-only: https://trac.videolan.org/vlc/ticket/8161
universal_variant no
@@ -62,7 +62,7 @@
pre-fetch {
if {"darwin" == ${os.platform} && ${os.major} < 10} {
- ui_error "${name} ${version} requires Mac OS X 10.6 or greater, use port 'VLC' instead"
+ ui_error "${name} ${version} requires Mac OS X 10.6 or greater."
return -code error "incompatible Mac OS X version"
}
}
@@ -72,7 +72,6 @@
configure.ac-no-arch.patch \
PR-34741-no__clang_version__.patch \
class_struct.patch \
- qtkit.patch \
static_assert.patch \
no-sparkle.patch
@@ -81,13 +80,11 @@
${worksrcpath}/modules/text_renderer/svg.c
}
-pre-configure {
- system "cd ${worksrcpath}/modules && find . -name Modules.am | sed 's|Modules.am||' | xargs ./genmf"
-}
+use_autoreconf yes
+autoreconf.cmd ./bootstrap
+autoreconf.pre_args {}
+depends_build-append port:libtool port:autoconf port:automake
-use_autoreconf yes
-autoreconf.args -fvi
-
configure.env-append CXXCPP="${configure.cxx} -E"
build.args-append DESTDIR=${worksrcpath}/dest_ignore
@@ -188,11 +185,23 @@
configure.args-append --enable-shout
}
-variant vcd description {Enable VCD support} {
- depends_lib-append port:vcdimager
- configure.args-delete --disable-vcdx
- configure.args-append --enable-vcdx
-}
+# TODO: libvcdx_plugin.la fails to link, eg:
+# "_cdio_log_set_handler", referenced from:
+# _VCDOpen in libvcdx_plugin_la-access.o
+# "_cdio_read_mode2_sector", referenced from:
+# _vcdplayer_read in libvcdx_plugin_la-vcdplayer.o
+# "_vcd_log_set_handler", referenced from:
+# _VCDOpen in libvcdx_plugin_la-access.o
+# "_vcdinf_get_bsn", referenced from:
+# _vcdplayer_read in libvcdx_plugin_la-vcdplayer.o
+# "_vcdinf_get_loop_count", referenced from:
+# _vcdplayer_read in libvcdx_plugin_la-vcdplayer.o
+# _VCDMetaInfo in libvcdx_plugin_la-info.o
+#variant vcd description {Enable VCD support} {
+# depends_lib-append port:vcdimager
+# configure.args-delete --disable-vcdx
+# configure.args-append --enable-vcdx
+#}
variant mod description {Enable MOD demuxer support} {
depends_lib-append port:libmodplug
@@ -322,7 +331,7 @@
}
post-destroot {
- eval file delete [glob ${destroot}${prefix}/lib/vlc/plugins/*.la]
+ eval file delete [glob ${destroot}${prefix}/lib/vlc/plugins/*/*.la]
if {[variant_isset qt4] || [variant_isset quartz]} {
file rename ${worksrcpath}/VLC.app ${destroot}${applications_dir}/VLC.app
Modified: trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch 2013-09-27 21:04:04 UTC (rev 111642)
+++ trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch 2013-09-27 21:07:32 UTC (rev 111643)
@@ -1,9 +1,20 @@
---- configure.ac.orig 2013-03-31 16:51:03.000000000 -0700
-+++ configure.ac 2013-03-31 16:51:47.000000000 -0700
-@@ -127,33 +127,12 @@ case "${host_os}" in
+commit 4d48f24e928d4c81d544f1ab232462577dd3e933
+Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Fri Sep 27 13:38:02 2013 -0700
+
+ Use arch flags from environment
+
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+
+diff --git a/configure.ac b/configure.ac
+index 417bfdb..f305a44 100644
+--- configure.ac
++++ configure.ac
+@@ -125,34 +125,12 @@ case "${host_os}" in
+ SYS=dragonfly
;;
darwin*)
-
+-
- dnl Force gcc "-arch" flag
- ARCH_flag=""
- case "${host}" in
@@ -36,6 +47,6 @@
+ CPPFLAGS="${CPPFLAGS}"
+ OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99"
+ LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
- VLC_ADD_LIBS([motion rotate], [-Wl,-framework,IOKit,-framework,CoreFoundation])
VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
- VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress])
+ VLC_ADD_LIBS([avcodec access_avio swscale postproc i420_rgb_mmx x262 x264 x26410b],[-Wl,-read_only_relocs,suppress])
+ VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,SystemConfiguration])
Modified: trunk/dports/multimedia/VLC-devel/files/qtkit.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/qtkit.patch 2013-09-27 21:04:04 UTC (rev 111642)
+++ trunk/dports/multimedia/VLC-devel/files/qtkit.patch 2013-09-27 21:07:32 UTC (rev 111643)
@@ -1,19 +0,0 @@
---- modules/access/Modules.am
-+++ modules/access/Modules.am
-@@ -1,3 +1,5 @@
-+AM_LIBTOOLFLAGS=--tag=CC
-+
- SUBDIRS = rtp
- noinst_LTLIBRARIES =
-
---- modules/access/qtsound.m
-+++ modules/access/qtsound.m
-@@ -40,7 +40,7 @@
- #include <vlc_dialog.h>
-
- //#define QTKIT_VERSION_MIN_REQUIRED 70603
--#define QTKIT_VERSION_MAX_ALLOWED 70700
-+//#define QTKIT_VERSION_MAX_ALLOWED 70700
-
- #import <QTKit/QTKit.h>
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130927/8f11cccf/attachment.html>
More information about the macports-changes
mailing list