[arch-commits] Commit in pragha/trunk (PKGBUILD cdio-includes.patch)

[Thorsten Töpper]

    Date: Wednesday, July 24, 2013 @ 21:06:33
  Author: ttoepper
Revision: 94431

upgpkg: pragha 1.1.2-2

* Switch to gstreamer from 0.10 to 1 thanks to J0k3r for the hint.

Modified:
  pragha/trunk/PKGBUILD
Deleted:
  pragha/trunk/cdio-includes.patch

---------------------+
 PKGBUILD            |   25 ++++++++++++++-----------
 cdio-includes.patch |   11 -----------
 2 files changed, 14 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-24 18:17:32 UTC (rev 94430)
+++ PKGBUILD	2013-07-24 19:06:33 UTC (rev 94431)
@@ -1,34 +1,37 @@
 # $Id$
 # Maintainer: Thorsten Töpper <atsutane-tu at freethoughts.de>
+# Contributor: J0k3r <moebius282 e4a t gmail D0_T com>
 # Contributor: Alois Nespor <alois.nespor at gmail.com>
-# Contributor: JerichoKru   <jerichokru(AT)htomail.com>
+# Contributor: JerichoKru   <jerichokru(AT)hotmail.com>
 
 pkgname=pragha
 pkgver=1.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager."
 arch=('i686' 'x86_64')
 url="http://pragha.wikispaces.com/"
 license=('GPL3')
-depends=('libnotify' 'libcdio-paranoia' 'gstreamer0.10-base'
+depends=('libnotify' 'libcdio-paranoia' 'gst-plugins-base'
          'taglib' 'hicolor-icon-theme'  'gtk2'
          'dbus-glib' 'sqlite' 'desktop-file-utils'
          'libclastfm')
-optdepends=('notification-daemon: OSD notification')
+optdepends=('notification-daemon: OSD notification'
+            'gst-plugins-good: A collection of gstreamer codecs'
+            'gst-plugins-bad: A collection of gstreamer codecs'
+            'gst-plugins-ugly: A collection of gstreamer codecs')
 makedepends=('intltool')
 replaces=('dissonance')
 install=pragha.install
-source=("http://dissonance.googlecode.com/files/pragha-$pkgver.tar.bz2"
-        cdio-includes.patch)
-sha1sums=('3e6456275a216110bd6942b2dc19b1120f4d14e5'
-          '83b366be516b4c09dbccbb25b473f2de545bdbe8')
+source=("http://dissonance.googlecode.com/files/pragha-$pkgver.tar.bz2")
+sha1sums=('3e6456275a216110bd6942b2dc19b1120f4d14e5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -Np1 -i "$srcdir/cdio-includes.patch"
-
-  LIBS+="-ldbus-glib-1"  ./configure --prefix=/usr
+  LIBS+="-ldbus-glib-1"  \
+    ./configure --prefix=/usr \
+                --with-gstreamer=1.0 \
+                CPPFLAGS="-DHAVE_PARANOIA_NEW_INCLUDES"
   make
 }
 

Deleted: cdio-includes.patch
===================================================================
--- cdio-includes.patch	2013-07-24 18:17:32 UTC (rev 94430)
+++ cdio-includes.patch	2013-07-24 19:06:33 UTC (rev 94431)
@@ -1,11 +0,0 @@
---- a/src/cdda.h.orig	2013-02-16 23:13:47.000000000 +0100
-+++ b/src/cdda.h	2013-06-02 21:07:50.473864563 +0200
-@@ -24,7 +24,7 @@
- #ifdef HAVE_PARANOIA_NEW_INCLUDES
-    #include <cdio/paranoia/cdda.h>
- #else
--   #include <cdio/cdda.h>
-+   #include <cdio/paranoia/cdda.h>
-    #ifdef __CDIO_CONFIG_H__
-       #include <cdio/cdio_unconfig.h>
-    #endif