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

jeremyhu at macports.org jeremyhu at macports.org
Sun Mar 31 21:19:24 PDT 2013 

Revision: 104707
          https://trac.macports.org/changeset/104707
Author:   jeremyhu at macports.org
Date:     2013-03-31 21:19:24 -0700 (Sun, 31 Mar 2013)
Log Message:
-----------
VLC-devel: Bump to recent 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	2013-04-01 03:23:41 UTC (rev 104706)
+++ trunk/dports/multimedia/VLC-devel/Portfile	2013-04-01 04:19:24 UTC (rev 104707)
@@ -5,7 +5,7 @@
 
 name                VLC-devel
 version             2.0.99
-revision            15
+revision            16
 
 categories          multimedia
 
@@ -26,7 +26,7 @@
 # http://git.videolan.org/?p=vlc.git
 fetch.type      git
 git.url         git://git.videolan.org/vlc.git
-git.branch      ecfe16669a5df27ad031e51af39d5d6f745d4fd0
+git.branch      c42f8e52f94176aa69e92ded29717c99364002e5
 
 #master_sites        http://download.videolan.org/pub/videolan/vlc/${version}/
 #distname            vlc-${version}

Modified: trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch	2013-04-01 03:23:41 UTC (rev 104706)
+++ trunk/dports/multimedia/VLC-devel/files/configure.ac-no-arch.patch	2013-04-01 04:19:24 UTC (rev 104707)
@@ -1,10 +1,9 @@
---- configure.ac.orig	2012-10-28 03:16:42.000000000 -0700
-+++ configure.ac	2012-10-28 03:19:38.000000000 -0700
-@@ -126,35 +126,11 @@ case "${host_os}" in
-     SYS=dragonfly
+--- 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
      ;;
    darwin*)
--
+ 
 -    dnl Force gcc "-arch" flag
 -    ARCH_flag=""
 -    case "${host}" in
@@ -21,7 +20,6 @@
 -        ARCH_flag="-arch x86_64"
 -      ;;
 -      arm*)
--        ARCH_flag="-arch armv7"
 -        ac_cv_c_bigendian="no"
 -        ac_cv_c_attribute_packed="no"
 -      ;;
@@ -35,6 +33,7 @@
 -    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([motion rotate], [-Wl,-framework,IOKit,-framework,CoreFoundation])

Modified: trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch	2013-04-01 03:23:41 UTC (rev 104706)
+++ trunk/dports/multimedia/VLC-devel/files/no-sparkle.patch	2013-04-01 04:19:24 UTC (rev 104707)
@@ -1,9 +1,10 @@
-diff -Naurp configure.ac configure.ac
---- configure.ac	2012-09-12 15:56:25.000000000 -0700
-+++ configure.ac	2012-09-12 16:13:44.000000000 -0700
-@@ -3614,13 +3614,6 @@ then
+diff --git configure.ac configure.ac
+index fd31f16..af37c4c 100644
+--- configure.ac
++++ configure.ac
+@@ -3685,13 +3685,6 @@ then
  
-   VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration])
+   VLC_ADD_LIBS([macosx], [-Wl,-framework,QTKit -Wl,-framework,IOKit -Wl,-framework,AddressBook -Wl,-framework,WebKit -Wl,-framework,CoreAudio -Wl,-framework,SystemConfiguration -Wl,-framework,ScriptingBridge])
  
 -  if test ! -d ${CONTRIB_DIR}/Sparkle.framework
 -  then
@@ -15,20 +16,21 @@
    if test ! -d ${CONTRIB_DIR}/BGHUDAppKit.framework
    then
      AC_MSG_ERROR([BGHUDAppKit framework is required and was not found in ${CONTRIB_DIR}])
-diff -Naurp extras/package/macosx/Resources/English.lproj/Preferences.xib extras/package/macosx/Resources/English.lproj/Preferences.xib
---- extras/package/macosx/Resources/English.lproj/Preferences.xib	2012-09-12 15:56:18.000000000 -0700
-+++ extras/package/macosx/Resources/English.lproj/Preferences.xib	2012-09-12 16:13:44.000000000 -0700
-@@ -4467,9 +4467,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAI
+diff --git extras/package/macosx/Resources/English.lproj/Preferences.xib extras/package/macosx/Resources/English.lproj/Preferences.xib
+index a932b0e..5f58bbd 100644
+--- extras/package/macosx/Resources/English.lproj/Preferences.xib
++++ extras/package/macosx/Resources/English.lproj/Preferences.xib
+@@ -4682,9 +4682,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
          <string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
          <bool key="NSWindowIsRestorable">YES</bool>
        </object>
 -      <object class="NSCustomObject" id="761483302">
 -        <string key="NSClassName">SUUpdater</string>
 -      </object>
-     </object>
-     <object class="IBObjectContainer" key="IBDocument.Objects">
-       <object class="NSMutableArray" key="connectionRecords">
-@@ -5803,22 +5800,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAI
+       <object class="NSWindowTemplate" id="898680423">
+         <int key="NSWindowStyleMask">15</int>
+         <int key="NSWindowBacking">2</int>
+@@ -6833,22 +6830,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
            <int key="connectionID">3554</int>
          </object>
          <object class="IBConnectionRecord">
@@ -51,7 +53,7 @@
            <object class="IBOutletConnection" key="connection">
              <string key="label">o_intf_update_ckb</string>
              <reference key="source" ref="150917409"/>
-@@ -8384,12 +8365,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAI
+@@ -9560,12 +9541,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
              <reference key="parent" ref="492678965"/>
            </object>
            <object class="IBObjectRecord">
@@ -64,18 +66,19 @@
              <int key="objectID">3556</int>
              <reference key="object" ref="243384014"/>
              <object class="NSMutableArray" key="children">
-diff -Naurp modules/gui/macosx/intf.m modules/gui/macosx/intf.m
---- modules/gui/macosx/intf.m	2012-09-12 15:56:20.000000000 -0700
-+++ modules/gui/macosx/intf.m	2012-09-12 16:13:44.000000000 -0700
-@@ -65,7 +65,6 @@
- #import "TrackSynchronization.h"
+diff --git modules/gui/macosx/intf.m modules/gui/macosx/intf.m
+index c5fced6..da7d001 100644
+--- modules/gui/macosx/intf.m
++++ modules/gui/macosx/intf.m
+@@ -69,7 +69,6 @@
+ #import "AudioEffects.h"
  
  #import <AddressBook/AddressBook.h>         /* for crashlog send mechanism */
 -#import <Sparkle/Sparkle.h>                 /* we're the update delegate */
  
- /*****************************************************************************
-  * Local prototypes.
-@@ -821,16 +820,6 @@ static VLCMain *_o_sharedMainInstance = 
+ #import "iTunes.h"
+ 
+@@ -916,16 +915,6 @@ static VLCMain *_o_sharedMainInstance = nil;
  }
  
  #pragma mark -
@@ -92,10 +95,11 @@
  #pragma mark Media Key support
  
  -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event
-diff -Naurp modules/gui/macosx/simple_prefs.m modules/gui/macosx/simple_prefs.m
---- modules/gui/macosx/simple_prefs.m	2012-09-12 15:56:20.000000000 -0700
-+++ modules/gui/macosx/simple_prefs.m	2012-09-12 16:15:31.000000000 -0700
-@@ -39,8 +39,6 @@
+diff --git modules/gui/macosx/simple_prefs.m modules/gui/macosx/simple_prefs.m
+index a91fe3a..4407d25 100644
+--- modules/gui/macosx/simple_prefs.m
++++ modules/gui/macosx/simple_prefs.m
+@@ -38,8 +38,6 @@
  #import "AppleRemote.h"
  #import "CoreInteraction.h"
  
@@ -104,7 +108,7 @@
  static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier";
  static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier";
  static NSString* VLCAudioSettingToolbarIdentifier = @"Audio Settings Item Identifier";
-@@ -229,7 +227,6 @@ create_toolbar_item(NSString * o_itemIde
+@@ -235,7 +233,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")];
@@ -112,7 +116,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")];
-@@ -433,10 +430,6 @@ static inline char * __config_GetLabel(v
+@@ -440,10 +437,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"];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130331/e62c47b2/attachment.html>

More information about the macports-changes mailing list