[arch-commits] CVS update of extra/multimedia/libavg (3 files)
Jan de Groot
jgc at archlinux.org
Sun Mar 30 13:18:03 UTC 2008
Date: Sunday, March 30, 2008 @ 09:18:03
Author: jgc
Path: /home/cvs-extra/extra/multimedia/libavg
Added: dc1394-2.0.patch (1.1) gcc-4.3.patch (1.1)
Modified: PKGBUILD (1.9 -> 1.10)
upgpkg: libavg 0.7.0-3
Fix compilation with gcc 4.3, boost 1.34 and libdc1394-2.0
------------------+
PKGBUILD | 45 ++++++++-----
dc1394-2.0.patch | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++
gcc-4.3.patch | 130 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 327 insertions(+), 19 deletions(-)
Index: extra/multimedia/libavg/PKGBUILD
diff -u extra/multimedia/libavg/PKGBUILD:1.9 extra/multimedia/libavg/PKGBUILD:1.10
--- extra/multimedia/libavg/PKGBUILD:1.9 Sat Dec 22 15:15:31 2007
+++ extra/multimedia/libavg/PKGBUILD Sun Mar 30 09:18:02 2008
@@ -1,40 +1,47 @@
-# $Id: PKGBUILD,v 1.9 2007/12/22 20:15:31 alexander Exp $
-# Mantainer: Alexander Baldeck <alexander at archlinux.org>
+# $Id: PKGBUILD,v 1.10 2008/03/30 13:18:02 jgc Exp $
+# Maintainer: Alexander Baldeck <alexander at archlinux.org>
pkgname=libavg
pkgver=0.7.0
-pkgrel=2
+pkgrel=3
pkgdesc="High-level multimedia platform with a focus on interactive art installations"
arch=('i686' 'x86_64')
url="http://www.libavg.de"
-depends=('imagemagick' 'ffmpeg>=20071204-1' 'libgl' 'mesa' 'freetype2' 'boost>=1.33.1-6' 'python>=2.5' \
- 'libdc1394')
+depends=('imagemagick' 'ffmpeg>=20071204-1' 'boost>=1.34.1-2' 'python>=2.5'
+ 'libdc1394>=2.0.1')
makedepends=('pkgconfig' 'diffutils' 'libtool' 'autoconf' 'automake')
-options=('!libtool')
+options=('!libtool' '!emptydirs')
license=('LGPL')
-source=(http://www.libavg.de/${pkgname}-${pkgver}.tar.gz)
+source=(http://www.libavg.de/${pkgname}-${pkgver}.tar.gz
+ gcc-4.3.patch
+ dc1394-2.0.patch)
+md5sums=('2aedc1ea3cc4a14e98e0c891f217fa03'
+ '50b41c612a64aedbc14958baa2e67355'
+ '35fa2846381016c612d6b68b400b89a1')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
+ patch -Np0 -i ${startdir}/src/gcc-4.3.patch || return 1
+ patch -Np0 -i ${startdir}/src/dc1394-2.0.patch || return 1
- if [ "$CARCH" = "x86_64" ]; then
- export CFLAGS="$CFLAGS -fPIC"
- export CXXFLAGS="$CFLAGS"
+ if [ "${CARCH}" = "x86_64" ]; then
+ export CFLAGS="${CFLAGS} -fPIC"
+ export CXXFLAGS="${CFLAGS}"
fi
- autoreconf -f -v
+ touch README INSTALL ChangeLog AUTHORS
+ libtoolize --force --copy || return 1
+ aclocal -I ./m4 || return 1
+ autoconf || return 1
+ automake || return 1
./configure --prefix=/usr \
--disable-DFB \
--enable-GL \
--enable-v4l2 \
- --enable-dc1394 \
- --with-boost-thread
+ --with-boost-thread=boost_thread-mt || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install
+ make DESTDIR=${startdir}/pkg install || return 1
- mkdir -p ${startdir}/pkg/etc
+ install -d -m755 ${startdir}/pkg/etc
install -m 644 ${startdir}/src/${pkgname}-${pkgver}/src/avgrc \
- ${startdir}/pkg/etc/avgrc
-
- rm -rf ${startdir}/pkg/usr/share
+ ${startdir}/pkg/etc/avgrc || return 1
}
-md5sums=('2aedc1ea3cc4a14e98e0c891f217fa03')
Index: extra/multimedia/libavg/dc1394-2.0.patch
diff -u /dev/null extra/multimedia/libavg/dc1394-2.0.patch:1.1
--- /dev/null Sun Mar 30 09:18:03 2008
+++ extra/multimedia/libavg/dc1394-2.0.patch Sun Mar 30 09:18:02 2008
@@ -0,0 +1,171 @@
+--- src/imaging/FWCamera.h.orig 2008-03-30 12:26:53.000000000 +0000
++++ src/imaging/FWCamera.h 2008-03-30 12:27:20.000000000 +0000
+@@ -86,6 +86,7 @@
+ int m_FrameRateConstant; // libdc1394 constant for framerate.
+ int m_Mode; // libdc1394 constant for mode.
+ #elif AVG_ENABLE_1394_2
++ dc1394_t * m_pDC1394;
+ dc1394camera_t * m_pCamera;
+ dc1394featureset_t m_FeatureSet;
+ dc1394framerate_t m_FrameRateConstant;
+--- configure.in.orig 2008-03-30 12:27:59.000000000 +0000
++++ configure.in 2008-03-30 12:28:13.000000000 +0000
+@@ -73,7 +73,7 @@
+ enable_1394=$enableval, enable_1394=maybe)
+ if test "$enable_1394" = maybe; then
+ AC_CHECK_LIB(dc1394_control, main, enable_1394=yes, enable_1394=no, -lraw1394)
+- PKG_CHECK_MODULES([DC1394_2], [libdc1394],,AC_MSG_NOTICE([libdc1394 ver 2 not found]))
++ PKG_CHECK_MODULES([DC1394_2], [libdc1394-2],,AC_MSG_NOTICE([libdc1394 ver 2 not found]))
+ fi
+ AM_CONDITIONAL(ENABLE_1394, test x$enable_1394 = xyes)
+ AM_CONDITIONAL(ENABLE_1394_2, test x"$DC1394_2_LIBS" != x )
+--- src/imaging/FWCamera.cpp
++++ src/imaging/FWCamera.cpp
+@@ -62,7 +62,6 @@
+ {
+ #ifdef AVG_ENABLE_1394
+ int CaptureFormat = 0;
+- // TODO: Support other resolutions.
+ switch(m_Mode) {
+ case MODE_320x240_YUV422:
+ case MODE_640x480_MONO:
+@@ -161,13 +160,13 @@
+ err = dc1394_start_iso_transmission(m_FWHandle, m_Camera.node);
+ checkDC1394Error(err, "Unable to start camera iso transmission");
+ #elif AVG_ENABLE_1394_2
+- dc1394camera_t **ppCameras=NULL;
+- uint32_t numCameras;
+ m_bCameraAvailable = true;
++ dc1394camera_list_t * pCameraList;
+
+- int err=dc1394_find_cameras(&ppCameras, &numCameras);
++ m_pDC1394 = dc1394_new();
++ int err=dc1394_camera_enumerate(m_pDC1394, &pCameraList);
+
+- if (err!=DC1394_SUCCESS && err != DC1394_NO_CAMERA) {
++ if (err!=DC1394_SUCCESS) {
+ AVG_TRACE(Logger::ERROR, "Unable to look for cameras");
+ #ifdef linux
+ AVG_TRACE(Logger::ERROR, "Please check");
+@@ -179,7 +178,7 @@
+ exit(1);
+ }
+
+- if (numCameras<1) {
++ if (pCameraList->num == 0) {
+ static bool bFirstWarning = true;
+ if (bFirstWarning) {
+ AVG_TRACE(Logger::WARNING, "No firewire cameras found.");
+@@ -189,17 +188,19 @@
+ return;
+ }
+ // This always uses the first camera on the bus.
+- m_pCamera=ppCameras[0];
++ m_pCamera=dc1394_camera_new(m_pDC1394, pCameraList->ids[0].guid);
++ if (!m_pCamera) {
++ AVG_TRACE(Logger::WARNING, "Could not initialize firewire camera.");
++ m_bCameraAvailable = false;
++ return;
++ }
+
+- // Free the other cameras
+- for (unsigned int i=1;i<numCameras;i++)
+- dc1394_free_camera(ppCameras[i]);
+- free(ppCameras);
++ dc1394_camera_free_list(pCameraList);
+
+- err = dc1394_get_camera_feature_set(m_pCamera, &m_FeatureSet);
+- checkDC1394Error(err,
+- "Unable to get firewire camera feature set.");
+- dumpCameraInfo();
++// err = dc1394_feature_get_all(m_pCamera, &m_FeatureSet);
++// checkDC1394Error(err,
++// "Unable to get firewire camera feature set.");
++// dumpCameraInfo();
+
+ err = dc1394_video_set_iso_speed(m_pCamera, DC1394_ISO_SPEED_400);
+ checkDC1394Error(err, "Unable to set camera iso speed.");
+@@ -221,23 +222,21 @@
+ << " in the current video mode.");
+ dc1394_capture_stop(m_pCamera);
+ dc1394_video_set_transmission(m_pCamera, DC1394_OFF);
+- dc1394_free_camera(m_pCamera);
++ dc1394_camera_free(m_pCamera);
+ exit(1);
+ }
+
+ err = dc1394_video_set_framerate(m_pCamera, m_FrameRateConstant);
+ checkDC1394Error(err, "Unable to set camera framerate.");
+
+- if (dc1394_capture_setup_dma(m_pCamera,8)!=DC1394_SUCCESS) {
+- AVG_TRACE(Logger::ERROR,
+- "Unable to setup camera. Make sure that");
+- AVG_TRACE(Logger::ERROR,
+- "video mode and framerate (" <<
++ if (dc1394_capture_setup(m_pCamera,8, DC1394_CAPTURE_FLAGS_DEFAULT)!=DC1394_SUCCESS) {
++ AVG_TRACE(Logger::ERROR, "Unable to setup camera. Make sure that");
++ AVG_TRACE(Logger::ERROR, "video mode and framerate (" <<
+ m_FrameRate << ") are");
+ AVG_TRACE(Logger::ERROR, "supported by your camera.");
+ dc1394_capture_stop(m_pCamera);
+ dc1394_video_set_transmission(m_pCamera, DC1394_OFF);
+- dc1394_free_camera(m_pCamera);
++ dc1394_camera_free(m_pCamera);
+ exit(1);
+ }
+ if (dc1394_video_set_transmission(m_pCamera, DC1394_ON) !=DC1394_SUCCESS) {
+@@ -273,9 +272,10 @@
+ // dc1394_dma_release_camera(m_FWHandle, &m_Camera);
+ dc1394_destroy_handle(m_FWHandle);
+ #elif AVG_ENABLE_1394_2
++ dc1394_video_set_transmission(m_pCamera, DC1394_OFF);
+ dc1394_capture_stop(m_pCamera);
+- dc1394_video_set_transmission(m_pCamera, DC1394_OFF);
+- dc1394_free_camera(m_pCamera);
++ dc1394_camera_free(m_pCamera);
++ dc1394_free(m_pDC1394);
+ #endif
+ m_bCameraAvailable = false;
+ AVG_TRACE(Logger::CONFIG, "Firewire camera closed.");
+@@ -323,12 +323,13 @@
+ bGotFrame = (rc == DC1394_SUCCESS);
+ #else
+ dc1394video_frame_t * pFrame;
++ dc1394error_t err;
+ if (bWait) {
+- pFrame = dc1394_capture_dequeue_dma(m_pCamera, DC1394_VIDEO1394_WAIT);
++ err = dc1394_capture_dequeue(m_pCamera, DC1394_CAPTURE_POLICY_WAIT, &pFrame);
+ } else {
+- pFrame = dc1394_capture_dequeue_dma(m_pCamera, DC1394_VIDEO1394_POLL);
++ err = dc1394_capture_dequeue(m_pCamera, DC1394_CAPTURE_POLICY_POLL, &pFrame);
+ }
+- if (pFrame) {
++ if (err == DC1394_SUCCESS && pFrame) {
+ bGotFrame = true;
+ pCaptureBuffer = pFrame->image;
+ }
+@@ -414,7 +415,7 @@
+ #ifdef AVG_ENABLE_1394
+ dc1394_dma_done_with_buffer(&m_Camera);
+ #else
+- dc1394_capture_enqueue_dma (m_pCamera, pFrame);
++ dc1394_capture_enqueue(m_pCamera, pFrame);
+ #endif
+ return pCurBitmap;
+ } else {
+@@ -582,8 +583,7 @@
+ void FWCamera::dumpCameraInfo()
+ {
+ // TODO: do this using AVG_TRACE
+- dc1394_print_camera_info(m_pCamera);
+- dc1394_print_feature_set(&m_FeatureSet);
++ dc1394_feature_print_all(&m_FeatureSet, stderr);
+ }
+ #else
+ void FWCamera::dumpCameraInfo()
+
+Property changes on: FWCamera.cpp
+___________________________________________________________________
+Name: eol-style
+ + native
+
Index: extra/multimedia/libavg/gcc-4.3.patch
diff -u /dev/null extra/multimedia/libavg/gcc-4.3.patch:1.1
--- /dev/null Sun Mar 30 09:18:03 2008
+++ extra/multimedia/libavg/gcc-4.3.patch Sun Mar 30 09:18:02 2008
@@ -0,0 +1,130 @@
+--- src/base/FileHelper.cpp.orig 2008-03-30 12:13:24.000000000 +0000
++++ src/base/FileHelper.cpp 2008-03-30 12:13:38.000000000 +0000
+@@ -32,6 +32,7 @@
+ #include <map>
+ #include <iostream>
+ #include <fstream>
++#include <cstring>
+
+ using namespace std;
+
+--- src/base/XMLHelper.cpp.orig 2008-03-30 12:14:36.000000000 +0000
++++ src/base/XMLHelper.cpp 2008-03-30 12:14:49.000000000 +0000
+@@ -23,6 +23,7 @@
+
+ #include <libxml/parserInternals.h>
+ #include <iostream>
++#include <cstring>
+
+ using namespace std;
+
+--- src/base/MemHelper.cpp.orig 2008-03-30 12:15:46.000000000 +0000
++++ src/base/MemHelper.cpp 2008-03-30 12:16:07.000000000 +0000
+@@ -37,6 +37,7 @@
+ #else
+ #include <sstream>
+ #endif
++#include <cstdlib>
+
+ namespace avg {
+
+--- src/graphics/Bitmap.cpp.orig 2008-03-30 12:16:54.000000000 +0000
++++ src/graphics/Bitmap.cpp 2008-03-30 12:17:08.000000000 +0000
+@@ -35,6 +35,7 @@
+ #include <iostream>
+ #include <iomanip>
+ #include <stdlib.h>
++#include <cstring>
+
+ using namespace Magick;
+ using namespace std;
+--- src/graphics/Filterflip.cpp.orig 2008-03-30 12:17:44.000000000 +0000
++++ src/graphics/Filterflip.cpp 2008-03-30 12:17:59.000000000 +0000
+@@ -20,6 +20,7 @@
+ //
+
+ #include "Filterflip.h"
++#include <cstring>
+
+ namespace avg {
+
+--- src/graphics/FilterHighpass.cpp.orig 2008-03-30 12:18:44.000000000 +0000
++++ src/graphics/FilterHighpass.cpp 2008-03-30 12:18:57.000000000 +0000
+@@ -26,6 +26,7 @@
+
+ #include <iostream>
+ #include <sstream>
++#include <cstring>
+
+ using namespace std;
+
+--- src/graphics/FilterFastBandpass.cpp.orig 2008-03-30 12:21:00.000000000 +0000
++++ src/graphics/FilterFastBandpass.cpp 2008-03-30 12:21:17.000000000 +0000
+@@ -27,6 +27,7 @@
+
+ #include <iostream>
+ #include <sstream>
++#include <cstring>
+
+ using namespace std;
+
+--- src/graphics/testgraphics.cpp.orig 2008-03-30 12:22:17.000000000 +0000
++++ src/graphics/testgraphics.cpp 2008-03-30 12:22:28.000000000 +0000
+@@ -46,6 +46,7 @@
+ #include <iostream>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+
+ using namespace avg;
+ using namespace std;
+--- src/imaging/TrackerConfig.cpp.orig 2008-03-30 12:23:16.000000000 +0000
++++ src/imaging/TrackerConfig.cpp 2008-03-30 12:23:29.000000000 +0000
+@@ -32,6 +32,7 @@
+ #include <libxml/xmlstring.h>
+
+ #include <sstream>
++#include <cstring>
+
+ using namespace std;
+
+--- src/imaging/V4LCamera.cpp.orig 2008-03-30 12:49:22.000000000 +0000
++++ src/imaging/V4LCamera.cpp 2008-03-30 12:49:37.000000000 +0000
+@@ -39,6 +39,7 @@
+ #include <sys/time.h>
+ #include <unistd.h>
+ #include <iostream>
++#include <cstring>
+
+ #define CLEAR(x) memset (&(x), 0, sizeof (x))
+
+--- src/imaging/DeDistort.cpp.orig 2008-03-30 12:48:49.000000000 +0000
++++ src/imaging/DeDistort.cpp 2008-03-30 12:49:13.000000000 +0000
+@@ -27,6 +27,7 @@
+
+ #include <iostream>
+ #include <math.h>
++#include <cstring>
+
+ const double sqrt3 = sqrt(3.);
+
+--- src/video/FFMpegDemuxer.cpp.orig 2008-03-30 12:50:35.000000000 +0000
++++ src/video/FFMpegDemuxer.cpp 2008-03-30 12:50:48.000000000 +0000
+@@ -25,6 +25,7 @@
+
+ #include <iostream>
+ #include <assert.h>
++#include <cstring>
+
+ using namespace std;
+
+--- src/parport/ParPort.cpp.orig 2008-03-30 12:52:22.000000000 +0000
++++ src/parport/ParPort.cpp 2008-03-30 12:52:36.000000000 +0000
+@@ -39,6 +39,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <cerrno>
++#include <cstring>
+
+ using namespace std;
+
More information about the arch-commits
mailing list