From beb901905784215f4fe4cd7a286f7c45e1ee4c24 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Thu, 8 Nov 2012 08:09:05 -0500 Subject: [PATCH] libsaria: Switch to gstreamer 1.0 Gstreamer 1.0 has been out for a while and replaces gstreamer 0.10. Let's make sure we use the most recent version going forward. Signed-off-by: Bryan Schumaker --- PKGBUILD.tmpl | 4 ++-- libsaria/Sconscript | 2 +- libsaria/audio/alsa.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PKGBUILD.tmpl b/PKGBUILD.tmpl index df6a8ab6..da02146c 100644 --- a/PKGBUILD.tmpl +++ b/PKGBUILD.tmpl @@ -6,8 +6,8 @@ pkgdesc="A simple GTK and gstreamer based music player." url="http://www.ocarinaproject.net/" arch=('x86_64' 'i686') license=('SimPL') -depends=('gtk2' 'gstreamer0.10-base' 'gstreamer0.10-base-plugins' 'taglib') -optdepends=('gstreamer0.10-good-plugins' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-ugly-plugins') +depends=('gtk2' 'gstreamer' 'gst-plugins-base' 'taglib') +optdepends=('gst-plugins-good' 'gst-plugins-bad' 'gst-plugins-ugly') makedepends=('scons') conflicts=() replaces=() diff --git a/libsaria/Sconscript b/libsaria/Sconscript index c137401b..9911e3cb 100644 --- a/libsaria/Sconscript +++ b/libsaria/Sconscript @@ -2,7 +2,7 @@ import config config.env.ParseConfig('pkg-config --cflags --libs gstreamer-0.10') -config.env.ParseConfig('pkg-config --cflags --libs gstreamer-interfaces-0.10') +#config.env.ParseConfig('pkg-config --cflags --libs gstreamer-interfaces-0.10') config.env.ParseConfig('pkg-config --cflags --libs taglib') files = config.get_cpp_files() diff --git a/libsaria/audio/alsa.cpp b/libsaria/audio/alsa.cpp index c915b821..b1b5062f 100644 --- a/libsaria/audio/alsa.cpp +++ b/libsaria/audio/alsa.cpp @@ -1,5 +1,5 @@ // Copyright (c) 2012 Bryan Schumaker. -#include +//#include #include #include #include