[arch-commits] Commit in vlc/trunk (PKGBUILD vlc-libnotify-0.7.patch)

[Ionut Biru]

    Date: Monday, March 7, 2011 @ 14:54:36
  Author: ibiru
Revision: 112944

upgpkg: vlc 1.1.7-5
libnotify 0.7 rebuild

Added:
  vlc/trunk/vlc-libnotify-0.7.patch
Modified:
  vlc/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   11 +++++++----
 vlc-libnotify-0.7.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-07 19:54:28 UTC (rev 112943)
+++ PKGBUILD	2011-03-07 19:54:36 UTC (rev 112944)
@@ -6,7 +6,7 @@
 pkgbase=vlc
 pkgname=('vlc' 'vlc-plugin')
 pkgver=1.1.7
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
 license=('GPL')
@@ -21,14 +21,17 @@
              '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-1.1.7-libmatroska.patch
+        vlc-libnotify-0.7.patch)
 md5sums=('932ce1fa4afa54b56ac0ccc0655667b6'
-         'd03b0a4f3d2a0ece5c0a9e1a2919dec0')
+         'd03b0a4f3d2a0ece5c0a9e1a2919dec0'
+         '122ae89daed6ebfe6e95455506ee0a1e')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
-  patch -Np1 -i ${srcdir}/vlc-1.1.7-libmatroska.patch
+  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 \

Added: vlc-libnotify-0.7.patch
===================================================================
--- vlc-libnotify-0.7.patch	                        (rev 0)
+++ vlc-libnotify-0.7.patch	2011-03-07 19:54:36 UTC (rev 112944)
@@ -0,0 +1,29 @@
+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 );