--- libavg-0.8.0.orig/src/video/FFMpegDecoder.cpp +++ libavg-0.8.0/src/video/FFMpegDecoder.cpp @@ -792,7 +792,7 @@ case R8G8B8X8: case R8G8B8A8: // XXX: Unused and broken. - DestFmt = PIX_FMT_RGBA32; + DestFmt = PIX_FMT_RGBA32; break; case B8G8R8X8: case B8G8R8A8: --- libavg-0.8.0.orig/debian/README.Debian +++ libavg-0.8.0/debian/README.Debian @@ -0,0 +1,21 @@ +libavg for Debian +----------------- + + +libavg is build with OpenGL support. + + + +The following text is no longer true but I keep it meanwhile: + +To install or build the package you need to add the Christian Marillat's +archive to /etc/apt/sources like this: + +deb http://www.debian-multimedia.org sid main + +You need at least libavcodeccvs51-dev, libfaac-dev, libfaad2-dev, and +liblame-dev from this archive. + + + -- Torsten Werner , Sun Aug 27 23:54:36 CEST 2006 + --- libavg-0.8.0.orig/debian/libavg.pth +++ libavg-0.8.0/debian/libavg.pth @@ -0,0 +1 @@ +libavg --- libavg-0.8.0.orig/debian/pycompat +++ libavg-0.8.0/debian/pycompat @@ -0,0 +1 @@ +2 --- libavg-0.8.0.orig/debian/rules +++ libavg-0.8.0/debian/rules @@ -0,0 +1,43 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + +DEB_DH_MAKESHLIBS_ARGS := -Xavg +PYTHON_VERSIONS := $(shell pyversions -vr) +CONFIGURE_ARGS := --prefix=/usr --mandir=/usr/share/man + +CHECK_DIRS := base graphics lmfit player conradrelais imaging parport python video + +PYTHON_26 = $(CURDIR)/debian/python-libavg/usr/lib/python2.6/ + +configure/python-libavg:: $(addprefix debian/stamp-configure, $(PYTHON_VERSIONS)) +debian/stamp-configure%: + mkdir build$* + cd build$* && ../configure $(CONFIGURE_ARGS) PYTHON=python$* \ + BOOST_PYTHON_LIBS=-lboost_python-py$(subst .,,$*) + touch $@ + +build/python-libavg:: $(addprefix debian/stamp-build, $(PYTHON_VERSIONS)) +debian/stamp-build%: + make -C build$* + touch $@ + +install/python-libavg:: $(addprefix debian/stamp-install, $(PYTHON_VERSIONS)) + dh_pycentral -p$(cdbs_curpkg) +debian/stamp-install%: + -make -C build$*/src check SUBDIRS="$(CHECK_DIRS)" + make -C build$* install DESTDIR=$(DEB_DESTDIR) + dh_install debian/libavg.pth /usr/lib/python$*/*-packages/ + rmdir -p --ignore-fail-on-non-empty $(DEB_DESTDIR)/usr/share/avg + mv $(DEB_DESTDIR)/usr/bin/avg_showfont.py \ + $(DEB_DESTDIR)/usr/bin/avg_showfont + mv $(DEB_DESTDIR)/usr/bin/avg_videoplayer.py \ + $(DEB_DESTDIR)/usr/bin/avg_videoplayer + [ ! -d $(PYTHON_26)/site-packages/ ] || mv $(PYTHON_26)/site-packages/* $(PYTHON_26)/dist-packages/ + [ ! -d $(PYTHON_26)/site-packages/ ] || rmdir $(PYTHON_26)/site-packages + touch $@ + +clean:: + $(RM) -r build* debian/stamp-* + --- libavg-0.8.0.orig/debian/changelog +++ libavg-0.8.0/debian/changelog @@ -0,0 +1,288 @@ +libavg (0.8.0-2ubuntu2.1) jaunty-proposed; urgency=low + + * Stable Release Update (LP: #363436). + * debian/control: + - Change "XS-Python-Version" from "2.5" to ">= 2.5", so that it + gets build for Python 2.6. + * debian/rules: + - Move Python 2.6 stuff from site-packages to dist-packages. + + -- Siegfried-Angel Gevatter Pujals Thu, 23 Apr 2009 23:15:08 +0200 + +libavg (0.8.0-2ubuntu2) jaunty; urgency=low + + * Python 2.6 transition: + - debian/rules: replace site-packages with wildcarded *-packages + * debian/patches/avg_namespace.diff: + - Fix FTBFS with recent ffmpeg. + + -- Luca Falavigna Wed, 01 Apr 2009 09:25:17 +0000 + +libavg (0.8.0-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #315451) + - No remaining changes. + * debian/patches/ffmpeg-headers.diff: Patch to provide new + header locations for libavcodec, libavformat & libswscale. + + -- Stefan Lesicnik Fri, 09 Jan 2009 15:03:00 +0200 + +libavg (0.8.0-2) unstable; urgency=low + + * Add patch gcc-4.4.diff provided by Martin Michlmayr. + (Closes: #505593) + + -- Torsten Werner Fri, 14 Nov 2008 00:32:16 +0100 + +libavg (0.8.0-1) unstable; urgency=low + + * new upstream release + - Uses GraphicsMagick++ instead of ImageMagick++. (Closes: #485895) + - Does no longer support python 2.4. + * Remove patch libavg_gcc-4.3.diff because it is not needed any more. + * Remove .py extension from scripts installed into /usr/bin. + + -- Torsten Werner Tue, 07 Oct 2008 22:49:40 +0200 + +libavg (0.7.0-9ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + Patch configure to use pkg-config instead of ffmpeg-config. This + change can be reverted once a new version of ffmpeg-free is + uploaded which removes ffmpeg-config. + + -- Emanuele Gentili Wed, 20 Aug 2008 02:29:08 +0200 + +libavg (0.7.0-9) unstable; urgency=low + + * Add missing Build-Depends: libswscale-dev. (Closes: #487644) + * Bump up Standards-Version: 3.8.0 (no changes needed). + + -- Torsten Werner Fri, 15 Aug 2008 17:15:47 +0200 + +libavg (0.7.0-8ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + Patch configure to use pkg-config instead of ffmpeg-config. This + change can be reverted once a new version of ffmpeg-free is + uploaded which removes ffmpeg-config. + + debian/control: + - Update Standards Version. + + -- Emanuele Gentili Sat, 02 Aug 2008 15:32:35 +0200 + +libavg (0.7.0-8) unstable; urgency=medium + + * Change Build-Depends: libdc1394-22-dev. + + -- Torsten Werner Sun, 20 Jul 2008 23:14:49 +0200 + +libavg (0.7.0-7ubuntu1) intrepid; urgency=low + + [ Iain Lane ] + * Patch configure to use pkg-config instead of ffmpeg-config. This change + can be reverted once a new version of ffmpeg-free is uploaded which + removes ffmpeg-config. (LP: #246720) + * Modify Maintainer value to match the DebianMaintainerField + specification. + + [ Michael Bienia ] + * Convert the above changes to configure into a quilt patch + (disable_ffmpeg-config.diff). + + -- Michael Bienia Wed, 09 Jul 2008 23:25:41 +0200 + +libavg (0.7.0-7) unstable; urgency=high + + * Remove Build-Depends: liblzo-dev; thanks to Andreas Henriksson. + (Closes: #485914) + + -- Torsten Werner Tue, 24 Jun 2008 23:37:17 +0200 + +libavg (0.7.0-6) unstable; urgency=low + + * Support both python 2.4 and 2.5. + * Build-Depend on a recent libboost-python-dev. + * Clean up Build-Depends on libmagick++. + + -- Torsten Werner Sun, 23 Mar 2008 09:22:14 +0100 + +libavg (0.7.0-5) unstable; urgency=low + + * Add a patch from Cyril Brulebois to support g++ 4.3. (Closes: #455436) + * Make debian/copyright more verbose. + * Replace python by Python in description of the package. + + -- Torsten Werner Fri, 07 Mar 2008 20:57:39 +0100 + +libavg (0.7.0-4) unstable; urgency=low + + * Update Homepage and Vcs fields. + * Set Standards-Version: 3.7.3. + * Remove redundant Build-Depends: python-all-dev. + * Install libavg.pth into the correct directory. + * Remove empty directory /usr/share/avg. + + -- Torsten Werner Mon, 07 Jan 2008 21:14:49 +0100 + +libavg (0.7.0-3) unstable; urgency=low + + * Ignore errors from 'make check' because they are probably errors of the + buildd environment. (Closes: #447246) + + -- Torsten Werner Sun, 09 Dec 2007 21:22:36 +0100 + +libavg (0.7.0-2) unstable; urgency=low + + * Remove the last patch because it is not needed anymore. + * Enable 'make check' during the build process. + + -- Torsten Werner Tue, 02 Oct 2007 20:07:26 +0200 + +libavg (0.7.0-1) unstable; urgency=low + + * New upstream version + * Fix debian/watch to reflect the changes of the website. + * Remove patches that have been applied upstream. + * Refresh one remaining patch. + * Add missing Build-Depends: libboost-thread-dev. + * Do not run the autotools any more and remove the Build-Depends. + * Switch back to python 2.4 because boost has been built with that version. + * Do no longer specify BOOST_LIBS as an argument to configure because it is + not needed any more. + + -- Torsten Werner Tue, 18 Sep 2007 19:10:28 +0200 + +libavg (0.6.0-6) unstable; urgency=low + + * Add a patch for newer ffmpeg provided by Ulrich von Zadow. + (Closes: #427202) + * Add patch from Martin Michlmayr for gcc-4.3. (Closes: #417357) + + -- Torsten Werner Sat, 30 Jun 2007 09:20:54 +0200 + +libavg (0.6.0-5) unstable; urgency=low + + * Fix linking the boost_python library. + + -- Torsten Werner Sun, 20 May 2007 13:55:49 +0200 + +libavg (0.6.0-4) unstable; urgency=low + + * Switch to new boost packages and python 2.5. + * Switch to debhelper 5. + + -- Torsten Werner Sun, 20 May 2007 09:01:22 +0200 + +libavg (0.6.0-3) unstable; urgency=low + + * Add file /usr/lib/python2.4/site-packages/libavg.pth. + + -- Torsten Werner Thu, 18 Jan 2007 07:22:37 +0100 + +libavg (0.6.0-2) unstable; urgency=low + + * Switch from dh_python to python-central. + * Add XS-X-Vcs-Svn header and Homepage to debian/control. + + -- Torsten Werner Fri, 8 Dec 2006 14:25:40 +0100 + +libavg (0.6.0-1) experimental; urgency=low + + * New upstream release. + * Uploading to experimental. + * Removing all patches because they are not needed anymore. + * Do not run automake anymore. + + -- Torsten Werner Sun, 5 Nov 2006 14:43:11 +0100 + +libavg (0.5.9-4) unstable; urgency=low + + * move patches/ directory into debian/ directory where cdbs expects it + * add patch 64bit.diff from upstream that fixes compilation errors on 64bit + platforms, closes: #386619 + * add debian/pycompat (policy version 1) + + -- Torsten Werner Sat, 9 Sep 2006 21:35:54 +0200 + +libavg (0.5.9-3) unstable; urgency=low + + * remove reference to www.debian-multimedia.org from package description + + -- Torsten Werner Mon, 28 Aug 2006 07:06:46 +0200 + +libavg (0.5.9-2) unstable; urgency=low + + * uses libtool now; fixes non PIC code (patch sent to upstream author) + * add checks to debian/rules (still commented out) + * add patch for 'make check' + * removed any non-free Build-Depends and move the package from contrib to + main + * set Architecture back to any because it should be possible to autobuild + the package now + * removed stuff specific to the python 2.4 transition that has happened + finally + * add a cosmetic patch pkg-config.diff which is intended to be sent to the + upstream author + + -- Torsten Werner Sun, 27 Aug 2006 23:25:58 +0200 + +libavg (0.5.9-1) unstable; urgency=low + + * fixed debian/watch + * new upstream release + * set Architecture to i386 because the package does not get autobuilded + * add patch for gcc 4.1.1 from Alexander Baldeck + * lintian fixes + + -- Torsten Werner Sat, 12 Aug 2006 11:03:24 +0200 + +libavg (0.5.7-1) experimental; urgency=low + + * new upstream version + * set Standards-Version to 3.7.2, no changes needed + * use dh_python + * exclude avg.so from dh_makeshlibs + * documented the packages from debian-multimedia.org which are needed to + build libavg, closes: #376424 + * minor lintian fixes + * updated description in debian/control + * upload to experimental because of the python2.4 transition + * add patch gcc.diff for newer gccs + + -- Torsten Werner Tue, 11 Jul 2006 21:20:09 +0200 + +libavg (0.5.4-1) unstable; urgency=low + + * New upstream release + * final switch to pkg-config + * changed Build-Depends: libavcodeccvs51-dev | libavcodeccvs-dev | libavcodec2-dev + * added a lot of Build-Depends + * removed old autoconf changes + + -- Torsten Werner Sun, 23 Apr 2006 19:22:04 +0200 + +libavg (0.5.3-1) unstable; urgency=low + + * new upstream + * switched from Magick++-config to pkg-config, closes: #347407 + + -- Torsten Werner Sat, 14 Jan 2006 12:37:39 +0100 + +libavg (0.2.0-2) unstable; urgency=low + + * changed Build-Depends: libmagick++9-dev | libmagick++6-dev, + closes: #341817 + * added hint to Christian Marillat's archive to README.Debian, + closes: #332522 + * changed Build-Depends: libavcodeccvs-dev | libavcodec2-dev + * some small lintian cleanups + + -- Torsten Werner Sun, 4 Dec 2005 17:42:35 +0100 + +libavg (0.2.0-1) unstable; urgency=low + + * Initial Release, closes: #329429 + + -- Torsten Werner Wed, 21 Sep 2005 21:13:19 +0200 + --- libavg-0.8.0.orig/debian/install +++ libavg-0.8.0/debian/install @@ -0,0 +1 @@ +src/avgrc /etc/ --- libavg-0.8.0.orig/debian/compat +++ libavg-0.8.0/debian/compat @@ -0,0 +1 @@ +5 --- libavg-0.8.0.orig/debian/control +++ libavg-0.8.0/debian/control @@ -0,0 +1,29 @@ +Source: libavg +Section: python +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Torsten Werner +Build-Depends: cdbs, debhelper (>= 5), libavcodec-dev, libavformat-dev, + libboost-python-dev (>= 1.34.1-8), libboost-thread-dev, libdc1394-22-dev, + libgraphicsmagick++1-dev, libpango1.0-dev, libsdl1.2-dev, libswscale-dev, + libtool, libxml2-dev, libxxf86vm-dev, python-all-dev, python-central (>= 0.5), + quilt +XS-Python-Version: >= 2.5 +Homepage: http://www.libavg.de +Vcs-Svn: svn+ssh://svn.debian.org/svn/collab-maint/deb-maint/libavg/trunk +Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/libavg/trunk/ +Standards-Version: 3.8.0 + +Package: python-libavg +Architecture: any +Depends: ${python:Depends}, ${shlibs:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: libavg Ain't Vector Graphics + libavg is a high-level multimedia platform with a focus on interactive + installations. It is meant to pick up where Macromedia Director leaves off and + gives you high-quality hardware-accelerated visuals as well as easy and + flexible authoring, testing and deployment. libavg integrates well with other + open-source solutions for sound, networking and hardware device support, + resulting in a complete and well-integrated package. It uses an xml-based + layout language for screen design and Python as scripting language. --- libavg-0.8.0.orig/debian/copyright +++ libavg-0.8.0/debian/copyright @@ -0,0 +1,28 @@ +This package was debianized by Torsten Werner on +Wed Sep 21 21:17:09 CEST 2005. + +It was downloaded from http://www.libavg.de/ . + +Upstream Author: Ulrich von Zadow + +Copyright: 2003-2007 Ulrich von Zadow + +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + +On Debian GNU/Linux systems the text of the license can be found at +/usr/share/common-licenses/LGPL . + --- libavg-0.8.0.orig/debian/watch +++ libavg-0.8.0/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://www.libavg.de/download.php libavg-(.*).tar.gz --- libavg-0.8.0.orig/debian/patches/avg_namespace.diff +++ libavg-0.8.0/debian/patches/avg_namespace.diff @@ -0,0 +1,13 @@ +Index: libavg-0.8.0/src/video/FFMpegDecoder.cpp +=================================================================== +--- libavg-0.8.0.orig/src/video/FFMpegDecoder.cpp 2009-04-01 08:49:00.000000000 +0000 ++++ libavg-0.8.0/src/video/FFMpegDecoder.cpp 2009-04-01 08:59:25.000000000 +0000 +@@ -787,7 +787,7 @@ + unsigned char * pDestBits = pBmp->getPixels(); + DestPict.data[0] = pDestBits; + DestPict.linesize[0] = pBmp->getStride(); +- int DestFmt; ++ ::PixelFormat DestFmt; + switch(pBmp->getPixelFormat()) { + case R8G8B8X8: + case R8G8B8A8: --- libavg-0.8.0.orig/debian/patches/series +++ libavg-0.8.0/debian/patches/series @@ -0,0 +1,3 @@ +gcc-4.4.diff +ffmpeg-headers.diff +avg_namespace.diff --- libavg-0.8.0.orig/debian/patches/gcc-4.4.diff +++ libavg-0.8.0/debian/patches/gcc-4.4.diff @@ -0,0 +1,25 @@ +Index: libavg-0.8.0/src/graphics/FBOImage.cpp +=================================================================== +--- libavg-0.8.0.orig/src/graphics/FBOImage.cpp 2008-08-17 22:22:52.000000000 +0200 ++++ libavg-0.8.0/src/graphics/FBOImage.cpp 2008-11-14 00:34:05.000000000 +0100 +@@ -25,6 +25,8 @@ + #include "../base/Logger.h" + #include "../base/Exception.h" + ++#include ++ + namespace avg { + + FBOImage::FBOImage(const IntPoint& size, PixelFormat pf, int precision, +Index: libavg-0.8.0/src/graphics/OGLHelper.cpp +=================================================================== +--- libavg-0.8.0.orig/src/graphics/OGLHelper.cpp 2008-09-16 22:08:16.000000000 +0200 ++++ libavg-0.8.0/src/graphics/OGLHelper.cpp 2008-11-14 00:34:05.000000000 +0100 +@@ -33,6 +33,7 @@ + #endif + + #include ++#include + #include + #include + #include --- libavg-0.8.0.orig/debian/patches/ffmpeg-headers.diff +++ libavg-0.8.0/debian/patches/ffmpeg-headers.diff @@ -0,0 +1,70 @@ +=== modified file 'src/video/AudioVideoMsg.h' +--- old/src/video/AudioVideoMsg.h 2008-11-25 13:58:13 +0000 ++++ new/src/video/AudioVideoMsg.h 2009-01-09 09:46:41 +0000 +@@ -42,7 +42,7 @@ + #endif + + extern "C" { +-#include ++#include + } + + namespace avg { + +=== modified file 'src/video/FFMpegDecoder.h' +--- old/src/video/FFMpegDecoder.h 2008-11-25 13:58:13 +0000 ++++ new/src/video/FFMpegDecoder.h 2009-01-09 09:42:12 +0000 +@@ -46,10 +46,10 @@ + #endif + + extern "C" { +-#include +-#include ++#include ++#include + #ifdef AVG_ENABLE_SWSCALE +-#include ++#include + #endif + } + #include + +=== modified file 'src/video/FFMpegDemuxer.h' +--- old/src/video/FFMpegDemuxer.h 2008-11-25 13:58:13 +0000 ++++ /new/src/video/FFMpegDemuxer.h 2009-01-09 09:37:00 +0000 +@@ -42,7 +42,7 @@ + #pragma warning(push) + #pragma warning(disable:4244) + #endif +-#include ++#include + #ifdef _WIN32 + #pragma warning(pop) + #endif + +=== modified file 'src/video/IDemuxer.h' +--- old/src/video/IDemuxer.h 2008-11-25 13:58:13 +0000 ++++ new/src/video/IDemuxer.h 2009-01-09 09:38:40 +0000 +@@ -42,7 +42,7 @@ + #pragma warning(push) + #pragma warning(disable:4244) + #endif +-#include ++#include + #ifdef _WIN32 + #pragma warning(pop) + #endif + +=== modified file 'src/video/PacketVideoMsg.h' +--- old/src/video/PacketVideoMsg.h 2008-11-25 13:58:13 +0000 ++++ new/src/video/PacketVideoMsg.h 2009-01-09 09:42:26 +0000 +@@ -39,7 +39,7 @@ + #endif + + extern "C" { +-#include ++#include + } + + #include +