r6955 - in /vdr/vdr-plugin-image/trunk/debian: README.Debian changelog control patches/00list patches/01_link_libavcodec.dpatch patches/01_new-ffmpeg.dpatch rules
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Wed May 21 18:39:17 UTC 2008
Author: tiber-guest
Date: Wed May 21 18:39:16 2008
New Revision: 6955
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6955
Log:
* Removed 01_link_libavcodec.dpatch
* Added 01_new-ffmpeg.dpatch
* Build-depend on libavcodeccvs-dev | libavcodec-dev,
libavformatcvs-dev | libavformat-dev, libswscalecvs-dev | libswscale-dev
(See README.Debian)
* Now really switched Build-System to cdbs
Added:
vdr/vdr-plugin-image/trunk/debian/README.Debian
vdr/vdr-plugin-image/trunk/debian/patches/01_new-ffmpeg.dpatch (with props)
Removed:
vdr/vdr-plugin-image/trunk/debian/patches/01_link_libavcodec.dpatch
Modified:
vdr/vdr-plugin-image/trunk/debian/changelog
vdr/vdr-plugin-image/trunk/debian/control
vdr/vdr-plugin-image/trunk/debian/patches/00list
vdr/vdr-plugin-image/trunk/debian/rules
Added: vdr/vdr-plugin-image/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/README.Debian?rev=6955&op=file
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/README.Debian (added)
+++ vdr/vdr-plugin-image/trunk/debian/README.Debian Wed May 21 18:39:16 2008
@@ -1,0 +1,19 @@
+ffmpeg-usage
+------------
+
+The image plugin compiles with Debian's ffmpeg-free version, but it won't work,
+because an MPEG2 encoder is required, which has been removed from ffmpeg-free.
+
+Therefore, this plug-in should use the ffmpeg-Version (libav*cvs) from
+Cristian Marillats Dbeian Multimedia Repository
+
+ http://debian-multimedia.org/
+
+It's technically possible to use MPEG1 (which is available in ffmpeg-free)
+instead of MPEG2, but the image quality then seems to be really bad
+on some pictures (flickering in the MPEG-still image loop).
+
+Maybe with some more tweaking, MPEG1 / ffmpeg-free can be used, but
+for know I decided to stay with the non-free ffmpeg.
+
+ -- Tobias Grimm <tg at e-tobi.net> Wed, 21 May 2008 20:16:44 +0200
Modified: vdr/vdr-plugin-image/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/changelog?rev=6955&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-image/trunk/debian/changelog Wed May 21 18:39:16 2008
@@ -1,3 +1,14 @@
+vdr-plugin-image (0.2.7-14) experimental; urgency=low
+
+ * Removed 01_link_libavcodec.dpatch
+ * Added 01_new-ffmpeg.dpatch
+ * Build-depend on libavcodeccvs-dev | libavcodec-dev,
+ libavformatcvs-dev | libavformat-dev, libswscalecvs-dev | libswscale-dev
+ (See README.Debian)
+ * Now really switched Build-System to cdbs
+
+ -- Tobias Grimm <tg at e-tobi.net> Wed, 21 May 2008 20:39:02 +0200
+
vdr-plugin-image (0.2.7-13) experimental; urgency=low
* Increased package version to force rebuild for vdr 1.6.0-1ctvdr7
Modified: vdr/vdr-plugin-image/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/control?rev=6955&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/control (original)
+++ vdr/vdr-plugin-image/trunk/debian/control Wed May 21 18:39:16 2008
@@ -4,7 +4,9 @@
Maintainer: Tobias Grimm <tg at e-tobi.net>
Origin: ctvdr
Bugs: mailto:pkg-vdr-dvb-devel at lists.alioth.debian.org
-Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0), libavcodec-dev (>= 0.cvs20050626-2sarge1), libavformat-dev, libexif-dev (>= 0.6.12)
+Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0), pkg-config,
+ libavcodeccvs-dev | libavcodec-dev, libavformatcvs-dev | libavformat-dev,
+ libswscalecvs-dev | libswscale-dev, libexif-dev (>= 0.6.12),
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/
Modified: vdr/vdr-plugin-image/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/patches/00list?rev=6955&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/patches/00list (original)
+++ vdr/vdr-plugin-image/trunk/debian/patches/00list Wed May 21 18:39:16 2008
@@ -1,2 +1,2 @@
01_Makefile-fPIC-fix
-01_link_libavcodec
+01_new-ffmpeg
Added: vdr/vdr-plugin-image/trunk/debian/patches/01_new-ffmpeg.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/patches/01_new-ffmpeg.dpatch?rev=6955&op=file
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/patches/01_new-ffmpeg.dpatch (added)
+++ vdr/vdr-plugin-image/trunk/debian/patches/01_new-ffmpeg.dpatch Wed May 21 18:39:16 2008
@@ -1,0 +1,317 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_new-ffmpeg.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch adds som changes from the upstreams svn repository
+## DP: to allow it to be compiled with newer ffmpeg versions
+
+ at DPATCH@
+diff -urNad vdr-plugin-image-0.2.7~/HISTORY vdr-plugin-image-0.2.7/HISTORY
+--- vdr-plugin-image-0.2.7~/HISTORY 2007-01-02 14:56:07.000000000 +0100
++++ vdr-plugin-image-0.2.7/HISTORY 2008-05-21 19:38:01.000000000 +0200
+@@ -1,7 +1,11 @@
+ VDR Plugin 'image' Revision History
+ -----------------------------------
+
+-2006-01-02
++2007-06-10
++- for build now 'pkg-config' needed
++- Use swscale to converting image (Thanks to Holger Brunn, for summit a patch)
++
++2007-01-02
+ - Release Version 0.2.7
+
+ 2006-12-24
+diff -urNad vdr-plugin-image-0.2.7~/LIESMICH vdr-plugin-image-0.2.7/LIESMICH
+--- vdr-plugin-image-0.2.7~/LIESMICH 2006-01-28 08:06:34.000000000 +0100
++++ vdr-plugin-image-0.2.7/LIESMICH 2008-05-21 19:38:01.000000000 +0200
+@@ -22,7 +22,9 @@
+ - das Plugin ist abhängig vom folgenden Paketen
+ + ffmpeg (getestet mit ffmpeg-0.4.8/ffmpeg-0.4.9pre1/ffmpeg-cvs)
+ http://ffmpeg.sourceforge.net
+- + libexif-0.6.13 (siehe unten, für Kompilieren ohne diese)
++ + Zum Kompilieren wird 'pkg-config' benötigt
++ http://pkgconfig.freedesktop.org/
++ + libexif-0.6.13 ... 0.6.15 (siehe unten, für Kompilieren ohne diese)
+ http://libexif.sourceforge.net/
+ + zur Ausführung wird auch das Paket netpbm benötigt
+ http://netpbm.sourceforge.net/
+@@ -65,6 +67,11 @@
+
+ $ make plugins FFMDIR=/usr/src/ffmpeg-cvs
+
++ Kompilieren ohne swscaler zur Bildconvertierung mittels ffmpeg
++ (WITHOUT_SWSCALER=1 verwendet img_convert, notwendig für ältere Versionen von ffmpeg)
++
++ $ make plugins WITHOUT_SWSCALER=1
++
+ Kompilieren ohne libexif ¹)
+
+ $ make plugins WITHOUT_LIBEXIF=1
+diff -urNad vdr-plugin-image-0.2.7~/Makefile vdr-plugin-image-0.2.7/Makefile
+--- vdr-plugin-image-0.2.7~/Makefile 2006-08-27 15:51:11.000000000 +0200
++++ vdr-plugin-image-0.2.7/Makefile 2008-05-21 19:38:01.000000000 +0200
+@@ -1,7 +1,7 @@
+ #
+ # Makefile for Image plugin to VDR
+ #
+-# (C) 2004-2006 Andreas Brachold <anbr at users.berlios.de>
++# (C) 2004-2007 Andreas Brachold <anbr at users.berlios.de>
+ #
+ # This code is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU General Public License
+@@ -31,6 +31,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual
++PKG-CONFIG ?= pkg-config
+
+ ###############################################
+ ###############################################
+@@ -86,26 +87,38 @@
+ INCLUDES += -I$(VDRDIR)/include -I.
+
+ ifdef FFMDIR
+-INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
+-LIBS += -L$(FFMDIR)/libavcodec
++DEFINES += -DFFMDIR
++LIBS += -L$(FFMDIR)/libavcodec -lavcodec -lz
+ ifeq ($(LIBAVCODECVERSION),51)
+ LIBS += -L$(FFMDIR)/libavformat -L$(FFMDIR)/libavutil
+ LIBS += -lavformat -lavutil
+ endif
++ifndef WITHOUT_SWSCALER
++ DEFINES += -DHAVE_SWSCALER
++ LIBS += -L$(FFMDIR)/libswscale -lswscale
++endif
++else
++ PKG-LIBS += libavcodec
++ifndef WITHOUT_SWSCALER
++ PKG-LIBS += libswscale
+ endif
+-
+-LIBS += -lavcodec
+-LIBS += -lz
+-
+-ifdef FFMDIR
+-DEFINES += -DFFMDIR
+ endif
+
+ ifndef WITHOUT_LIBEXIF
+- LIBS += -lexif
++ PKG-INCLUDES += libexif
++ PKG-LIBS += libexif
+ DEFINES += -DHAVE_LIBEXIF
+ endif
+
++
++ifdef PKG-INCLUDES
++INCLUDES += $(shell $(PKG-CONFIG) --cflags $(PKG-INCLUDES))
++endif
++
++ifdef PKG-LIBS
++LIBS += $(shell $(PKG-CONFIG) --libs $(PKG-LIBS))
++endif
++
+ ### The object files (add further files here):
+
+ OBJS = ${PLUGIN}.o i18n.o data.o menu.o data-image.o menu-image.o \
+@@ -166,8 +179,7 @@
+ @-rm -rf $(TMPDIR)/$(ARCHIVE)
+ @echo Distribution package created as $(PACKAGE).tar.gz
+
+-clean:
+- @-rm -f $(OBJS) $(DEPFILE) *.so *.tar.gz core* *~ contrib/*~ examples/*~ scripts/*~
++subdirs-clean:
+ @for i in $(SUBDIRS) ;\
+ do \
+ ( cd $$i;\
+@@ -175,3 +187,6 @@
+ ) \
+ || exit 1;\
+ done
++
++clean: subdirs-clean
++ @-rm -f $(OBJS) $(DEPFILE) *.so *.tar.gz core* *~ contrib/*~ examples/*~ scripts/*~
+diff -urNad vdr-plugin-image-0.2.7~/README vdr-plugin-image-0.2.7/README
+--- vdr-plugin-image-0.2.7~/README 2006-01-14 12:07:29.000000000 +0100
++++ vdr-plugin-image-0.2.7/README 2008-05-21 19:38:01.000000000 +0200
+@@ -22,7 +22,9 @@
+ - plugin depends follow packages
+ + ffmpeg (tested with ffmpeg-0.4.8/ffmpeg-0.4.9pre1/ffmpeg-cvs)
+ http://ffmpeg.sourceforge.net
+- + libexif-0.6.13 (see below for build without this)
++ + for build you need 'pkg-config'
++ http://pkgconfig.freedesktop.org/
++ + libexif-0.6.13 ... 0.6.15 (see below for build without this)
+ http://libexif.sourceforge.net/
+ + for running your will need also package netpbm
+ http://netpbm.sourceforge.net/
+@@ -65,6 +67,11 @@
+
+ $ make plugins FFMDIR=/usr/src/ffmpeg-cvs
+
++ compile without swscaler to convert images via ffmpeg
++ (WITHOUT_SWSCALER=1 use img_convert, needed for older versions from ffmpeg)
++
++ $ make plugins WITHOUT_SWSCALER=1
++
+ compile without libexif ¹)
+
+ $ make plugins WITHOUT_LIBEXIF=1
+diff -urNad vdr-plugin-image-0.2.7~/data.h vdr-plugin-image-0.2.7/data.h
+--- vdr-plugin-image-0.2.7~/data.h 2006-01-27 22:31:04.000000000 +0100
++++ vdr-plugin-image-0.2.7/data.h 2008-05-21 19:38:01.000000000 +0200
+@@ -42,6 +42,7 @@
+ class cScanDir {
+ char *QuoteString(const char *str);
+ protected:
++ virtual ~cScanDir() {};
+ enum eScanType { stFile, stDir };
+ virtual void DoItem(cFileSource *src, const char *subdir, const char *name)=0;
+ public:
+diff -urNad vdr-plugin-image-0.2.7~/exif.c vdr-plugin-image-0.2.7/exif.c
+--- vdr-plugin-image-0.2.7~/exif.c 2006-05-30 19:41:21.000000000 +0200
++++ vdr-plugin-image-0.2.7/exif.c 2008-05-21 19:38:01.000000000 +0200
+@@ -1,7 +1,7 @@
+ /*
+ * Image plugin to VDR (C++)
+ *
+- * (C) 2006 Andreas Brachold <anbr at users.berlios.de>
++ * (C) 2006-2007 Andreas Brachold <anbr at users.berlios.de>
+ *
+ * This code is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+@@ -19,9 +19,11 @@
+ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+ */
+
++extern "C" {
+ #include <libexif/exif-data.h>
+ #include <libexif/exif-ifd.h>
+ #include <libexif/exif-loader.h>
++}
+
+ #include <sstream>
+
+diff -urNad vdr-plugin-image-0.2.7~/liboutput/Makefile vdr-plugin-image-0.2.7/liboutput/Makefile
+--- vdr-plugin-image-0.2.7~/liboutput/Makefile 2008-05-21 19:38:01.000000000 +0200
++++ vdr-plugin-image-0.2.7/liboutput/Makefile 2008-05-21 19:38:26.000000000 +0200
+@@ -9,6 +9,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -O0 -g -Wall -Woverloaded-virtual
++PKG-CONFIG ?= pkg-config
+
+ -include $(VDRDIR)/Make.config
+
+@@ -18,14 +19,28 @@
+ INCLUDES += -I$(VDRDIR)/include -I.
+ ifdef FFMDIR
+ INCLUDES += -I$(FFMDIR)/libavcodec -I$(FFMDIR)/libavutil
++DEFINES += -DFFMDIR
++ifndef WITHOUT_SWSCALER
++ DEFINES += -DHAVE_SWSCALER
++ INCLUDES += -I$(FFMDIR)/libswscale
++endif
++else
++
++ifndef WITHOUT_SWSCALER
++ DEFINES += -DHAVE_SWSCALER
++ PKG-INCLUDES += libswscale
++endif
++
++ PKG-INCLUDES += libavcodec
+ endif
+
+ DEFINES += -D_GNU_SOURCE
+
+-ifdef FFMDIR
+-DEFINES += -DFFMDIR
++ifdef PKG-INCLUDES
++INCLUDES += $(shell $(PKG-CONFIG) --cflags $(PKG-INCLUDES))
+ endif
+
++
+ ### The object files (add further files here):
+
+ OBJS = encode.o stillimage.o stillimage-player.o
+diff -urNad vdr-plugin-image-0.2.7~/liboutput/encode.c vdr-plugin-image-0.2.7/liboutput/encode.c
+--- vdr-plugin-image-0.2.7~/liboutput/encode.c 2006-12-24 13:04:16.000000000 +0100
++++ vdr-plugin-image-0.2.7/liboutput/encode.c 2008-05-21 19:38:01.000000000 +0200
+@@ -1,7 +1,7 @@
+ /***************************************************************************
+ * encode.c
+ *
+- * (C) Copyright 2004-2006 Andreas Brachold <anbr at users.berlios.de>
++ * (C) Copyright 2004-2007 Andreas Brachold <anbr at users.berlios.de>
+ * Created: Thu Aug 5 2004
+ *
+ ****************************************************************************/
+@@ -26,6 +26,16 @@
+ #include <string.h>
+ #include <stdlib.h>
+
++extern "C" {
++#ifdef HAVE_SWSCALER
++#ifdef FFMDIR
++#include <swscale.h>
++#else
++#include <ffmpeg/swscale.h>
++#endif
++#endif
++}
++
+ #include "encode.h"
+ #include <vdr/device.h>
+ #include <vdr/tools.h>
+@@ -190,11 +200,29 @@
+ }
+ else
+ {
+- if(img_convert((AVPicture*)frame->data, PIX_FMT_YUV420P,
++ int result;
++#ifndef HAVE_SWSCALER
++ result=img_convert((AVPicture*)frame->data, PIX_FMT_YUV420P,
+ (AVPicture*)m_pImageFilled, PIX_FMT_RGB24,
+- m_nWidth, m_nHeight))
++ m_nWidth, m_nHeight);
++#else
++ SwsContext* convert_ctx = sws_getContext(m_nWidth, m_nHeight,
++ PIX_FMT_RGB24, m_nWidth, m_nHeight,
++ PIX_FMT_YUV420P, SWS_BICUBIC, NULL, NULL, NULL);
++
++ if(!convert_ctx) {
++ esyslog("imageplugin: failed to initialize swscaler context");
++ return false;
++ }
++
++ result=sws_scale(convert_ctx, ((AVPicture*)m_pImageFilled)->data,
++ ((AVPicture*)m_pImageFilled)->linesize,
++ 0, m_nHeight, frame->data, frame->linesize);
++ sws_freeContext(convert_ctx);
++#endif
++ if(result < 0)
+ {
+- esyslog("imageplugin: failed convert RGB to YUV");
++ esyslog("imageplugin: failed convert RGB to YUV: %X", result);
+ return false;
+ }
+ }
+diff -urNad vdr-plugin-image-0.2.7~/liboutput/encode.h vdr-plugin-image-0.2.7/liboutput/encode.h
+--- vdr-plugin-image-0.2.7~/liboutput/encode.h 2006-01-11 20:23:30.000000000 +0100
++++ vdr-plugin-image-0.2.7/liboutput/encode.h 2008-05-21 19:38:01.000000000 +0200
+@@ -25,11 +25,13 @@
+ #ifndef _ENCODE_H
+ #define _ENCODE_H
+
++extern "C" {
+ #ifdef FFMDIR
+ #include <avcodec.h>
+ #else
+ #include <ffmpeg/avcodec.h>
+ #endif
++}
+
+ #include "../setup-image.h"
+ //#define TESTCODE
Propchange: vdr/vdr-plugin-image/trunk/debian/patches/01_new-ffmpeg.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: vdr/vdr-plugin-image/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-image/trunk/debian/rules?rev=6955&op=diff
==============================================================================
--- vdr/vdr-plugin-image/trunk/debian/rules (original)
+++ vdr/vdr-plugin-image/trunk/debian/rules Wed May 21 18:39:16 2008
@@ -1,93 +1,18 @@
#! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
+MAKE_OPTIONS = DVBDIR=/usr VDRDIR=/usr/include/vdr LIBDIR=.
-# To use dpatch uncomment the following line and set Build-Depends to dpatch
-DPATCH=yes
+common-build-arch::
+ $(MAKE) all $(MAKE_OPTIONS)
-ifdef DPATCH
-include /usr/share/dpatch/dpatch.make
-else
-patch:
-patch-stamp:
-unpatch:
-endif
+clean::
+ $(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
+ rm -f libvdr-*.so.*
-MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=.
-
-configure: configure-stamp
-configure-stamp: patch-stamp
- dh_testdir
- touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE) all $(MAKE_OPTIONS)
- touch build-stamp
-
-clean: clean-patched unpatch
-clean-patched:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
- -$(MAKE) -o .dependencies clean $(MAKE_OPTIONS)
- rm -f libvdr-*.so.*
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- dh_install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs
- dh_installexamples
-# dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installman
-# dh_installinfo
-# dh_undocumented
- dh_installchangelogs HISTORY
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_makeshlibs
- dh_installdeb
-# dh_perl
- dh_shlibdeps
+common-binary-predeb-arch::
sh /usr/share/vdr-dev/patchlevel.sh subst
sh /usr/share/vdr-dev/dependencies.sh
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure \
- clean-patched patch unpatch
More information about the pkg-vdr-dvb-changes
mailing list