[SCM] GNU Shockwave Flash (SWF) player branch, master, updated. debian/0.8.10_git20110618-2-3-ge16e975

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Shockwave Flash (SWF) player".

The branch, master has been updated
       via  e16e97536df2dad333d1e49747a1fbec97e252ed (commit)
       via  59bdd22c18eb703feab4265345e8ed38fe9d1158 (commit)
       via  85996b7dfa9be41baa26d601e8d5763f06c36060 (commit)
      from  2b748429e3e21c737200d97a3c2e41c61052d051 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e16e97536df2dad333d1e49747a1fbec97e252ed
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Jun 29 01:15:35 2011 +0200

    d/control: remove opengl B-Ds

commit 59bdd22c18eb703feab4265345e8ed38fe9d1158
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Wed Jun 29 01:14:00 2011 +0200

    Add 03qtopengl patch. Fixes qt4 include paths if opengl not built

commit 85996b7dfa9be41baa26d601e8d5763f06c36060
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Tue Jun 28 20:56:33 2011 +0200

    Remove opengl renderer.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog          |    6 ++++++
 debian/control            |   17 +++++++----------
 debian/patches/03qtopengl |   18 ++++++++++++++++++
 debian/patches/series     |    1 +
 debian/rules              |    6 +++---
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 880c29f..1b25098 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnash (0.8.10~git20110618-3) unstable; urgency=low
+
+  * Remove opengl renderer. 
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Tue, 28 Jun 2011 21:04:21 +0200
+
 gnash (0.8.10~git20110618-2) unstable; urgency=low
 
   * Add multiarch support (02multiarch).
diff --git a/debian/control b/debian/control
index 6022667..9ed91e9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,21 +1,18 @@
 Source: gnash
 Priority: optional
 Maintainer: Debian Flash Team <pkg-flash-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>,
- Alexander Sack <asac at jwsdot.com>,
- Gabriele Giacone <1o5g4r8o at gmail.com>,
- Tim Retout <diocles at debian.org>
+Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Alexander Sack <asac at jwsdot.com>,
+ Gabriele Giacone <1o5g4r8o at gmail.com>, Tim Retout <diocles at debian.org>
 Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 7.0.50~7), sng,
- dh-buildinfo, autoconf, automake, libtool, intltool, docbook, docbook2x,
- libltdl-dev, libxmu-dev, dejagnu, autotools-dev, doxygen, xsltproc, docbook-xsl,
+ dh-buildinfo, autoconf, automake, libtool, intltool, libltdl-dev,
+ libxmu-dev, dejagnu, autotools-dev, doxygen, xsltproc, docbook, docbook2x, docbook-xsl,
  libjpeg-dev, libpng12-dev | libpng-dev, libgif-dev, libagg-dev, libpango1.0-dev | pango-dev,
  libcurl4-gnutls-dev | libcurl3-gnutls-dev | libcurl4-openssl-dev | libcurl3-openssl-dev,
  libboost-dev, libboost-thread-dev, libboost-date-time-dev, libboost-program-options-dev,
- libgtk2.0-dev, libatk1.0-dev, python-all-dev, kdelibs5-dev,
- libgtkglext1-dev, python-gtk2-dev, libavcodec-dev, libavformat-dev, libswscale-dev, libspeex-dev,
- libgl1-mesa-dev, libsdl1.2-dev, libqt4-opengl-dev, qt4-qmake, python-support,
+ libgtk2.0-dev, libatk1.0-dev, python-all-dev, python-support, python-gtk2-dev,
+ libavcodec-dev, libavformat-dev, libswscale-dev, libspeex-dev, libspeexdsp-dev,
  libgstreamer-plugins-base0.10-dev | gstreamer-plugins-base-dev, libgstreamer0.10-dev | gstreamer0.10-dev,
- libmysqlclient-dev, xulrunner-dev, libspeexdsp-dev
+ libsdl1.2-dev, libqt4-dev, qt4-qmake, kdelibs5-dev, libmysqlclient-dev, xulrunner-dev,
 Standards-Version: 3.9.2
 Section: video
 Homepage: http://www.gnu.org/software/gnash/
diff --git a/debian/patches/03qtopengl b/debian/patches/03qtopengl
new file mode 100644
index 0000000..c216264
--- /dev/null
+++ b/debian/patches/03qtopengl
@@ -0,0 +1,18 @@
+Description: Fixes qt4 include paths, if opengl renderer not built.
+Author: Gabriele Giacone <1o5g4r8o at gmail.com>
+
+--- a/macros/qt4.m4
++++ b/macros/qt4.m4
+@@ -66,7 +66,11 @@ dnl     fi
+      AC_MSG_CHECKING([for QT 4.x headers])
+     if test x$cross_compiling = xno; then
+       if test x"${PKG_CONFIG}" != x -a x"${ac_cv_path_qt4_incl}" = x; then
+-        ${PKG_CONFIG} --exists  QtOpenGL QtCore QtGui && ac_cv_path_qt4_incl="`$PKG_CONFIG --cflags-only-I QtOpenGL QtCore QtGui`"
++	if test ${PKG_CONFIG} --exists QtOpenGL; then
++	  ac_cv_path_qt4_incl="`$PKG_CONFIG --cflags-only-I QtOpenGL`"
++	else
++	  ac_cv_path_qt4_incl="`$PKG_CONFIG --cflags-only-I QtGui`"
++	fi
+ 	gnash_qt4_topdir=`echo "${ac_cv_path_qt4_incl}"`
+       fi
+     fi
diff --git a/debian/patches/series b/debian/patches/series
index 6d15f31..0cd3d79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01cygnalman
 02multiarch
+03qtopengl
diff --git a/debian/rules b/debian/rules
index aa36481..33e1910 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,9 +48,9 @@ CONFIGURE_FLAGS = \
 		--enable-python \
 		--enable-jemalloc \
 		--enable-hwaccel=none \
-		--enable-media='gst,ffmpeg' \
-		--enable-gui='gtk,qt4' \
-		--enable-renderer=all \
+		--enable-media=gst,ffmpeg \
+		--enable-gui=gtk,qt4 \
+		--enable-renderer=agg,cairo \
 		--enable-docbook \
 		--enable-extensions=fileio,lirc,mysql \
 		--with-npapi-plugindir=/usr/lib/gnash \


hooks/post-receive
-- 
GNU Shockwave Flash (SWF) player