[115392] trunk/dports/multimedia/VLC-devel

1 Jan 2014

Revision: 115392
          https://trac.macports.org/changeset/115392
Author:   jeremyhu@macports.org
Date:     2014-01-01 00:13:16 -0800 (Wed, 01 Jan 2014)
Log Message:
-----------
VLC-devel: Bump to current git

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/no-sparkle.patch

Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================

--- trunk/dports/multimedia/VLC-devel/Portfile	2014-01-01 07:13:35 UTC (rev 115391)
+++ trunk/dports/multimedia/VLC-devel/Portfile	2014-01-01 08:13:16 UTC (rev 115392)
@@ -6,7 +6,7 @@
 
 name                VLC-devel
 version             2.1.99
-revision            3
+revision            4
 
 categories          multimedia
 
@@ -29,7 +29,7 @@
 fetch.type      git
 #git.url         git://git.videolan.org/vlc/vlc-2.1.git
 git.url         git://git.videolan.org/vlc.git
-git.branch      18cbe9639c57d5d3cc676909c64acd89997bcac3
+git.branch      050a16328dac1d3573326c43d47376d08210604d
 
 #master_sites        http://download.videolan.org/pub/videolan/vlc/${version}/
 #distname            vlc-${version}
@@ -74,12 +74,30 @@
     PR-34741-no__clang_version__.patch \
     class_struct.patch \
     static_assert.patch \
-    no-sparkle.patch \
-    patch-freetype-2.5.1.diff
+    no-sparkle.patch
 
 post-patch {
     reinplace "s:librsvg-2/librsvg:librsvg:" \
         ${worksrcpath}/modules/text_renderer/svg.c
+
+    set cxxstdlib {}
+
+    if {[info exists configure.cxx_stdlib] &&
+        ${configure.cxx_stdlib} ne {} &&
+        [string match *clang* ${configure.cxx}]} {
+        set cxxstdlib ${configure.cxx_stdlib}
+    } elseif {[string match *clang* ${configure.cxx}] &&
+              ${os.major} >= 13} {
+        set cxxstdlib libc++
+    } else {
+        set cxxstdlib libstdc++
+    }
+
+    if {${cxxstdlib} == "libc++"} {
+        reinplace "s:-lstdc\+\+:-lc++:" \
+            ${worksrcpath}/configure.ac \
+            ${worksrcpath}/modules/access/Makefile.am
+    }
 }
 
 use_autoreconf      yes
@@ -89,7 +107,7 @@
 depends_build-append port:libtool port:autoconf port:automake
 
 configure.env-append CXXCPP="${configure.cxx} -E"
-build.args-append    DESTDIR=${worksrcpath}/dest_ignore
+build.args-append    DESTDIR=${worksrcpath}/dest_ignore V=1
 
 # gl.c:121:3: error: Platform not recognized.
 configure.cppflags-append -D__unix__=1

Modified: trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch	2014-01-01 07:13:35 UTC (rev 115391)
+++ trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch	2014-01-01 08:13:16 UTC (rev 115392)
@@ -1,41 +1,31 @@
-commit 4d48f24e928d4c81d544f1ab232462577dd3e933
-Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date:   Fri Sep 27 13:38:02 2013 -0700
-
-    Use arch flags from environment
-    
-    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@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
+--- configure.ac.orig	2013-12-31 23:26:06.000000000 -0800
++++ configure.ac	2013-12-31 23:35:58.000000000 -0800
+@@ -138,22 +138,11 @@ case "${host_os}" in
      SYS=dragonfly
      ;;
    darwin*)
 -
 -    dnl Force gcc "-arch" flag
 -    ARCH_flag=""
--    case "${host}" in
--      i?86*)
+     case "${host}" in
+       i?86*)
 -        ARCH_flag="-arch i386"
--      ;;
+         YASMFLAGS="-f macho32"
+       ;;
 -      ppc64*)
 -        ARCH_flag="-arch ppc64"
 -      ;;
 -      ppc*)
 -        ARCH_flag="-arch ppc"
 -      ;;
--      x86_64*)
+       x86_64*)
 -        ARCH_flag="-arch x86_64"
--      ;;
--      arm*)
--        ac_cv_c_bigendian="no"
--        ac_cv_c_attribute_packed="no"
--      ;;
--    esac
--
+         YASMFLAGS="-f macho64"
+       ;;
+       arm*)
+@@ -163,11 +152,10 @@ case "${host_os}" in
+     esac
+ 
      SYS=darwin
 -    CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
 -    CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS ${ARCH_flag}"
@@ -44,9 +34,8 @@
 -    LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
 +    CFLAGS="${CFLAGS} -D_INTL_REDIRECT_MACROS"
 +    CXXFLAGS="${CXXFLAGS} -D_INTL_REDIRECT_MACROS"
-+    CPPFLAGS="${CPPFLAGS}"
 +    OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99"
 +    LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names"
      VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,AppKit])
      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])
+     VLC_ADD_LIBS([libvlccore],[-Wl,-framework,CoreFoundation,-framework,CoreServices])

Modified: trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch	2014-01-01 07:13:35 UTC (rev 115391)
+++ trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch	2014-01-01 08:13:16 UTC (rev 115392)
@@ -70,14 +70,15 @@
 index c5fced6..da7d001 100644
 --- modules/gui/macosx/intf.m
 +++ modules/gui/macosx/intf.m
-@@ -69,7 +69,6 @@
+@@ -69,8 +69,6 @@
+ #import "VideoEffects.h"
  #import "AudioEffects.h"
  
- #import <AddressBook/AddressBook.h>         /* for crashlog send mechanism */
 -#import <Sparkle/Sparkle.h>                 /* we're the update delegate */
- 
+-
  #import "iTunes.h"
  
+ /*****************************************************************************
 @@ -916,16 +915,6 @@ static VLCMain *_o_sharedMainInstance = nil;
  }
  
@@ -105,10 +106,10 @@
  
 -#import <Sparkle/Sparkle.h>                        //for o_intf_last_update_lbl
 -
- static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
- static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
- static NSString* VLCAudioSettingToolbarIdentifier = @"Audio Settings Item Identifier";
-@@ -235,7 +233,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
+ static const char *const ppsz_language[] =
+ {
+     "auto",
+@@ -365,7 +363,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc
      [o_intf_appleremote_sysvol_ckb setTitle: _NS("Control system volume with the Apple Remote")];
      [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")];
      [o_intf_update_ckb setTitle: _NS("Automatically check for updates")];
@@ -116,7 +117,7 @@
      [o_intf_enableGrowl_ckb setTitle: _NS("Enable Growl notifications (on playlist item change)")];
      [o_intf_autoresize_ckb setTitle: _NS("Resize interface to the native video size")];
      [o_intf_pauseminimized_ckb setTitle: _NS("Pause the video playback when minimized")];
-@@ -440,10 +437,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
+@@ -585,10 +582,6 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam
      [self setupButton: o_intf_appleremote_sysvol_ckb forBoolValue: "macosx-appleremote-sysvol"];
  
      [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"];

    

jeremyhu＠macports.org

tags

participants (1)