git » vlc.git » commit e8100df

diff --git a/PKGBUILD b/PKGBUILD
index c60580a..539cfb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgbase=vlc
 pkgname=('vlc' 'vlc-plugin')
-pkgver=1.1.7
-pkgrel=6
+pkgver=1.1.8
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
@@ -19,19 +19,12 @@ makedepends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'lirc-utils'
              'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
              'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse')
 options=('!libtool')
-source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-        vlc-1.1.7-libmatroska.patch
-        vlc-libnotify-0.7.patch)
-md5sums=('932ce1fa4afa54b56ac0ccc0655667b6' 'd03b0a4f3d2a0ece5c0a9e1a2919dec0'\
-         '122ae89daed6ebfe6e95455506ee0a1e')
-sha1sums=('6bd559fe2bba51c5ed1ae71d18dc8ac611e72a04' 'fcb47f77e7eaae39a8a5d96c027ab8eca19af81b'\
-         '43e10963d3c1dfd5f22e0195602aaf39aeb21c5c')
+source=("http://download.videolan.org/pub/videolan/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
+md5sums=('c0065ec11b6fd12167cd440cbe0ef0d9')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/vlc-1.1.7-libmatroska.patch"
-  patch -Np1 -i "${srcdir}/vlc-libnotify-0.7.patch"
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
   ./configure --prefix=/usr \
               --disable-rpath \
diff --git a/vlc-1.1.7-libmatroska.patch b/vlc-1.1.7-libmatroska.patch
deleted file mode 100644
index 71c8237..0000000
--- a/vlc-1.1.7-libmatroska.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Daniel Mierswa <impulze@impulze.org>
-Date: Thu, 3 Feb 2011 03:36:13 +0000 (+0100)
-Subject: backport multi tags patch
-X-Git-Url: http://git.videolan.org/?p=vlc%2Fvlc-1.1.git;a=commitdiff_plain;h=8f350488599b292521f4d460a945f13712fa6c75
-
-backport multi tags patch
-
-based on vlc.git 7be936ca451fa0c052069895460dcc0e67f4dfa3
-
-Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
----
-
-diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
-index 117dc03..25c9971 100644
---- a/modules/demux/mkv/matroska_segment.cpp
-+++ b/modules/demux/mkv/matroska_segment.cpp
-@@ -220,6 +220,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
-                     }
-                     ep->Up();
-                 }
-+#if LIBMATROSKA_VERSION < 0x010100
-                 else if( MKV_IS_ID( el, KaxTagGeneral ) )
-                 {
-                     msg_Dbg( &sys.demuxer, "|   + General" );
-@@ -288,6 +289,7 @@ void matroska_segment_c::LoadTags( KaxTags *tags )
-                 {
-                     msg_Dbg( &sys.demuxer, "|   + Multi Title" );
-                 }
-+#endif
-                 else
-                 {
-                     msg_Dbg( &sys.demuxer, "|   + LoadTag Unknown (%s)", typeid( *el ).name() );
-diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
-index 8b89b78..99a407c 100644
---- a/modules/demux/mkv/mkv.hpp
-+++ b/modules/demux/mkv/mkv.hpp
-@@ -92,13 +92,15 @@
- #include "matroska/KaxSegment.h"
- #include "matroska/KaxTag.h"
- #include "matroska/KaxTags.h"
-+#include "matroska/KaxVersion.h"
-+#if LIBMATROSKA_VERSION < 0x010100
- #include "matroska/KaxTagMulti.h"
-+#endif
- #include "matroska/KaxTracks.h"
- #include "matroska/KaxTrackAudio.h"
- #include "matroska/KaxTrackVideo.h"
- #include "matroska/KaxTrackEntryData.h"
- #include "matroska/KaxContentEncoding.h"
--#include "matroska/KaxVersion.h"
- 
- #include "ebml/StdIOCallback.h"
- 
diff --git a/vlc-libnotify-0.7.patch b/vlc-libnotify-0.7.patch
deleted file mode 100644
index 45c0bd7..0000000
--- a/vlc-libnotify-0.7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
-index 1e97c9e..b663caa 100644
---- a/modules/misc/notify/notify.c
-+++ b/modules/misc/notify/notify.c
-@@ -38,6 +38,10 @@
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- /*****************************************************************************
-  * Module descriptor
-  ****************************************************************************/
-@@ -312,7 +316,12 @@ static int Notify( vlc_object_t *p_this, const char *psz_temp, GdkPixbuf *pix,
-     }
- 
-     notification = notify_notification_new( _("Now Playing"),
--                                            psz_temp, NULL, NULL );
-+                                            psz_temp, NULL
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+					    );
-+#else
-+					    , NULL );
-+#endif
-     notify_notification_set_timeout( notification,
-                                 var_InheritInteger(p_this, "notify-timeout") );
-     notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW );