On So, 2015-09-20 at 19:17 +0200, Sebastian Dröge wrote: > On So, 2015-09-20 at 15:33 +0200, Sebastian Dröge wrote: > > Hi again, > > > > I shortly looked at the code in git in gstreamer.c. Not a single > > change other than the build system and package dependencies should > > be > > necessary here. > > FWIW, I'll send you a patch soonish. Seem to have something almost > working now.
Patch attached, please upload or should I do an NMU? Whatever you prefer :) Untested except for compilation!
diff -Nru gcompris-15.02/debian/changelog gcompris-15.02/debian/changelog --- gcompris-15.02/debian/changelog 2015-05-05 22:57:06.000000000 +0200 +++ gcompris-15.02/debian/changelog 2015-09-20 19:51:19.000000000 +0200 @@ -1,3 +1,10 @@ +gcompris (15.02-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Update to GStreamer 1.0 (Closes: #785840). + + -- Sebastian Dröge <sl...@debian.org> Sun, 20 Sep 2015 19:09:08 +0200 + gcompris (15.02-1) unstable; urgency=medium * New upstream release. diff -Nru gcompris-15.02/debian/control gcompris-15.02/debian/control --- gcompris-15.02/debian/control 2014-12-30 18:30:43.000000000 +0100 +++ gcompris-15.02/debian/control 2015-09-20 20:18:51.000000000 +0200 @@ -3,14 +3,14 @@ Priority: optional Maintainer: Yann Dirson <dir...@debian.org> Homepage: http://gcompris.net/ -Build-Depends: debhelper (>= 9), autotools-dev, dh-buildinfo, dpkg-dev (>= 1.13.19), libxml2-dev, python-dev, python-gtk2-dev, libxml-parser-perl, libxrandr-dev, libxxf86vm-dev, libsqlite3-dev, libgtk2.0-dev (>= 2.4.0), libgstreamer0.10-dev, intltool, librsvg2-dev, python-cairo-dev +Build-Depends: debhelper (>= 9), dh-autoreconf, autoconf, automake, libtool, autotools-dev, gnome-common, dh-buildinfo, dpkg-dev (>= 1.13.19), libxml2-dev, python-dev, python-gtk2-dev, libxml-parser-perl, libxrandr-dev, libxxf86vm-dev, libsqlite3-dev, libgtk2.0-dev (>= 2.4.0), libgstreamer1.0-dev, intltool, librsvg2-dev, python-cairo-dev Standards-Version: 3.9.3 Vcs-git: git://anonscm.debian.org/collab-maint/gcompris.git Vcs-browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gcompris.git;a=summary Package: gcompris Architecture: any -Depends: gcompris-data (= ${source:Version}), ${shlibs:Depends}, ${python:Depends}, python-pysqlite2, python-gtk2, gstreamer0.10-alsa | gstreamer0.10-audiosink, gstreamer0.10-plugins-base, gstreamer0.10-plugins-good, librsvg2-common (>= 2.18), python-cairo, ${misc:Depends} +Depends: gcompris-data (= ${source:Version}), ${shlibs:Depends}, ${python:Depends}, python-pysqlite2, python-gtk2, gstreamer1.0-alsa | gstreamer1.0-audiosink, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, librsvg2-common (>= 2.18), python-cairo, ${misc:Depends} Suggests: gnucap, tuxpaint Replaces: gcompris-data (<< 8.4.1) Description: Educational games for small children diff -Nru gcompris-15.02/debian/patches/01_gstreamer-1.0.patch gcompris-15.02/debian/patches/01_gstreamer-1.0.patch --- gcompris-15.02/debian/patches/01_gstreamer-1.0.patch 1970-01-01 01:00:00.000000000 +0100 +++ gcompris-15.02/debian/patches/01_gstreamer-1.0.patch 2015-09-20 20:28:27.000000000 +0200 @@ -0,0 +1,11 @@ +--- gcompris-15.02.orig/configure.ac ++++ gcompris-15.02/configure.ac +@@ -389,7 +389,7 @@ if test x$with_sdlmixer = xyes; then + AUDIO_LIBS="$AUDIO_LIBS -lSDL_mixer" + else + dnl Default is gstreamer +- PKG_CHECK_MODULES(AUDIO, gstreamer-0.10,, AC_MSG_ERROR([*** GSTREAMER not found!])) ++ PKG_CHECK_MODULES(AUDIO, gstreamer-1.0 gmodule-no-export-2.0,, AC_MSG_ERROR([*** GSTREAMER not found!])) + AC_DEFINE([USE_GSTREAMER], 1,[gstreamer is enabled]) + fi + AC_SUBST(AUDIO_CFLAGS) diff -Nru gcompris-15.02/debian/patches/series gcompris-15.02/debian/patches/series --- gcompris-15.02/debian/patches/series 2014-12-30 18:12:20.000000000 +0100 +++ gcompris-15.02/debian/patches/series 2015-09-20 19:10:46.000000000 +0200 @@ -0,0 +1 @@ +01_gstreamer-1.0.patch diff -Nru gcompris-15.02/debian/rules gcompris-15.02/debian/rules --- gcompris-15.02/debian/rules 2014-09-06 12:32:52.000000000 +0200 +++ gcompris-15.02/debian/rules 2015-09-20 19:09:31.000000000 +0200 @@ -10,7 +10,7 @@ #export DH_VERBOSE=1 %: - dh $@ --with autotools_dev --with python2 + dh $@ --with autoreconf,autotools_dev --with python2 SOUNDLANGS=$(shell grep '^Package: gcompris-sound-' debian/control | cut -d- -f3)
signature.asc
Description: This is a digitally signed message part
