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

jeremyhu at macports.org jeremyhu at macports.org
Fri Oct 24 07:57:40 PDT 2014


Revision: 127266
          https://trac.macports.org/changeset/127266
Author:   jeremyhu at macports.org
Date:     2014-10-24 07:57:40 -0700 (Fri, 24 Oct 2014)
Log Message:
-----------
VLC-devel: Bump to current 2.2 git

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

Removed Paths:
-------------
    trunk/dports/multimedia/VLC-devel/files/class_struct.patch

Modified: trunk/dports/multimedia/VLC-devel/Portfile
===================================================================
--- trunk/dports/multimedia/VLC-devel/Portfile	2014-10-24 14:15:50 UTC (rev 127265)
+++ trunk/dports/multimedia/VLC-devel/Portfile	2014-10-24 14:57:40 UTC (rev 127266)
@@ -6,7 +6,7 @@
 
 name                VLC-devel
 version             2.1.99
-revision            17
+revision            18
 
 categories          multimedia
 
@@ -28,8 +28,9 @@
 # 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          4c156e1054ce76bf305ae103646ce92ed6295e7b
+git.url             git://git.videolan.org/vlc/vlc-2.2.git
+#git.url             git://git.videolan.org/vlc.git
+git.branch          70d70ee0460d3e4fedc98428de9d539ec9352a34
 
 #master_sites        http://download.videolan.org/pub/videolan/vlc/${version}/
 #distname            vlc-${version}
@@ -136,7 +137,6 @@
 patchfiles          buildfix-package.mak.patch \
                     configure.ac-no-arch.patch \
                     PR-34741-no__clang_version__.patch \
-                    class_struct.patch \
                     static_assert.patch \
                     no-sparkle.patch
 

Deleted: trunk/dports/multimedia/VLC-devel/files/class_struct.patch
===================================================================
--- trunk/dports/multimedia/VLC-devel/files/class_struct.patch	2014-10-24 14:15:50 UTC (rev 127265)
+++ trunk/dports/multimedia/VLC-devel/files/class_struct.patch	2014-10-24 14:57:40 UTC (rev 127266)
@@ -1,39 +0,0 @@
-diff --git a/modules/demux/mkv/chapter_command.hpp b/modules/demux/mkv/chapter_command.hpp
-index 7c8a3c1..80b3e45 100644
---- modules/demux/mkv/chapter_command.hpp
-+++ modules/demux/mkv/chapter_command.hpp
-@@ -35,7 +35,7 @@ const binary MATROSKA_DVD_LEVEL_PG   = 0x18;
- const binary MATROSKA_DVD_LEVEL_PTT  = 0x10;
- const binary MATROSKA_DVD_LEVEL_CN   = 0x08;
- 
--class demux_sys_t;
-+struct demux_sys_t;
- 
- class chapter_codec_cmds_c
- {
-diff --git a/modules/demux/mkv/demux.hpp b/modules/demux/mkv/demux.hpp
-index 3cb5f60..4412044 100644
---- modules/demux/mkv/demux.hpp
-+++ modules/demux/mkv/demux.hpp
-@@ -326,7 +326,7 @@ private:
- };
- 
- 
--class demux_sys_t
-+struct demux_sys_t
- {
- public:
-     demux_sys_t( demux_t & demux )
-diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
-index c2d5478..6086f17 100644
---- modules/demux/mkv/mkv.cpp
-+++ modules/demux/mkv/mkv.cpp
-@@ -73,7 +73,7 @@ vlc_module_begin ()
-     add_shortcut( "mka", "mkv" )
- vlc_module_end ()
- 
--class demux_sys_t;
-+struct demux_sys_t;
- 
- static int  Demux  ( demux_t * );
- static int  Control( demux_t *, int, va_list );
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141024/1a72d17c/attachment.html>


More information about the macports-changes mailing list