diff options
author | Joerg Bornkessel <hd_brummy@gentoo.org> | 2011-01-03 21:58:15 +0000 |
---|---|---|
committer | Joerg Bornkessel <hd_brummy@gentoo.org> | 2011-01-03 21:58:15 +0000 |
commit | 5b60fdf1b9dfd35bcef3781ea2854ddc61a6cd5a (patch) | |
tree | 505e18a5d2d8dae46ea394ab40e305ea363859bf /media-plugins | |
parent | Pin gnome-desktop dependency to slot 2. (diff) | |
download | historical-5b60fdf1b9dfd35bcef3781ea2854ddc61a6cd5a.tar.gz historical-5b60fdf1b9dfd35bcef3781ea2854ddc61a6cd5a.tar.bz2 historical-5b60fdf1b9dfd35bcef3781ea2854ddc61a6cd5a.zip |
stable x86, bug #347676; cleanup; eapi=2
Package-Manager: portage-2.1.9.24/cvs/Linux i686
Diffstat (limited to 'media-plugins')
-rw-r--r-- | media-plugins/vdr-image/ChangeLog | 10 | ||||
-rw-r--r-- | media-plugins/vdr-image/Manifest | 14 | ||||
-rw-r--r-- | media-plugins/vdr-image/files/ffmpeg-0.4.9_p20080326-new_header.diff | 27 | ||||
-rw-r--r-- | media-plugins/vdr-image/files/vdr-image-0.2.7-gentoo.diff | 47 | ||||
-rw-r--r-- | media-plugins/vdr-image/files/vdr-image-0.2.7-new-ffmpeg.diff | 309 | ||||
-rw-r--r-- | media-plugins/vdr-image/files/vdr-image-0.2.7.26-gentoo.diff | 48 | ||||
-rw-r--r-- | media-plugins/vdr-image/vdr-image-0.3.0.ebuild | 14 |
7 files changed, 22 insertions, 447 deletions
diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog index c456df0e0a68..7c04614f3569 100644 --- a/media-plugins/vdr-image/ChangeLog +++ b/media-plugins/vdr-image/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-plugins/vdr-image -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.31 2010/12/22 13:35:18 hd_brummy Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.32 2011/01/03 21:58:14 hd_brummy Exp $ + + 03 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org> + -files/vdr-image-0.2.7.26-gentoo.diff, -files/vdr-image-0.2.7-gentoo.diff, + -files/vdr-image-0.2.7-new-ffmpeg.diff, vdr-image-0.3.0.ebuild, + -files/ffmpeg-0.4.9_p20080326-new_header.diff: + stable x86, bug #347676; cleanup; eapi=2 22 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-image-0.3.0.ebuild: diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest index 8f61e7d5c5aa..4c76a3d18134 100644 --- a/media-plugins/vdr-image/Manifest +++ b/media-plugins/vdr-image/Manifest @@ -1,26 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX ffmpeg-0.4.9_p20080326-new_header.diff 857 RMD160 a4e2be97fbae740679ff0e2c891a52f270b37077 SHA1 9de1beee1b4177b5f8794a591aca91058a6669f4 SHA256 7697bd1a44409ef2412014f902bd70711786f55dadebcc4d219edc7d11493865 AUX rc-addon-0.3.0.sh 712 RMD160 4de40d663fe1721e89f9834f0da2ba97aeedde56 SHA1 5f2105c806c6687663f0dd3fb52020cff6c9cee6 SHA256 713cd7048618c14e63b78da9921e9e178b3860adb5a6deea7808471363b4b766 AUX rc-addon.sh 672 RMD160 592ca37b35e4056b013585704ea2cf637e5dcae3 SHA1 769a5577a6849c77ac4bd32277aea5210996d393 SHA256 1d8a77095882d5b63ddeec7b422cd775b883b8ade3504a22e79d2e463f3eeb17 -AUX vdr-image-0.2.7-gentoo.diff 3497 RMD160 29973423e45e4211a69bff6dca01915a82aa2479 SHA1 30d7bbd7d33cb5672101a4aee1b893e9226ec858 SHA256 64cd28a8513bccfef99d3ab3f007e3df29aa255c2f1663dd89a3c9d104229903 -AUX vdr-image-0.2.7-new-ffmpeg.diff 9296 RMD160 64dbe6234470e3abce06d9193077591f6b50dfe1 SHA1 072f470cf6cd340d8538fa5d644de183a09a47c8 SHA256 4205844b08f29cfda5871c6b09374415fbb4b2789387910e1d2a13abb761ec85 -AUX vdr-image-0.2.7.26-gentoo.diff 3462 RMD160 8fca4867daa14b4887fe220c0317be95a1b6a9c4 SHA1 88ae693ec13d873255bd4cf17bc66f2ed95c4d59 SHA256 112f877013cc80310f1ccfdeab2b9121dc96de1f5d896f0111c079725ed9945f AUX vdr-image-0.3.0-gentoo.diff 2348 RMD160 0f0fca2a4edf787132adad0ccb69ac54a4b7e26f SHA1 138d0df0cff723df5cb367e468c339115f246024 SHA256 45024beab8174cdd2ac6f0a880fb1a5cefabdfd2781ef8511d71e49592e0357e DIST vdr-image-0.2.7.26.tar.gz 119800 RMD160 2c196373b8ab498f8486260cc70eb3a7d4145fa4 SHA1 a164cb3284570d8ff4f8e323f43a7a48f9e67a88 SHA256 f4eb2e2d4df6aeea0b0995fa7e39fc8aedfbf647f29ae730e7c2b4d693d71d9d DIST vdr-image-0.2.7.tar.gz 120080 RMD160 7fb93dff5740e5fdf317f0d7b6d666023eb9b3b9 SHA1 7281bb0f2530bb43a6291bfc62e44b43753478b5 SHA256 2e2c57164498e53241486a46542fd38294ece0120438b054539b137cfdafb93f DIST vdr-image-0.3.0.tar.gz 122950 RMD160 6cc19d29f0df8a3fea3e32e5a22691bb6d7d61c7 SHA1 9a2952ca9d0407018383724c92ebec64d55fc398 SHA256 73efc58729fdbf8860841af2f168e952e4ad0885e4d530e9075561233ccdd7f6 EBUILD vdr-image-0.2.7-r1.ebuild 1808 RMD160 5bff8f835d37e59ee54917a55c2c252b1591a020 SHA1 b4d12f188e2a9117c89634c5feb41f7b8864f0f5 SHA256 6516b5ed2ccb469918533dce4547a3521b7ad958725c6148f6562cadf7cd65fe EBUILD vdr-image-0.2.7.26.ebuild 1661 RMD160 1f71d438318473191015b05d162ab7da6ef9b53a SHA1 91fdda7b428bc14c8661fef511a3b17ab947d32b SHA256 1572d49a72a9386b88f4056161bb98513b17310233d08da7392797795afe169a -EBUILD vdr-image-0.3.0.ebuild 1511 RMD160 a01f7d3fd1ef7a79ccd795afc647ca2758bdf05e SHA1 59ffe81cb861f7908830f43627b7b7541f97e33a SHA256 dacb090a7bd46b1d20583de1ad5da739275fd16a122dbf62a83aeb175b06fdfa -MISC ChangeLog 5323 RMD160 11075793934cef43e7051b444753fa6d8a03891a SHA1 c2882ad5e01dcf9b60d74009ab0575b30a32edfd SHA256 ac50ebb5e2cb1de9fe31100b9ffc11e5b62213cbc656e7c3cb07cada0642b372 +EBUILD vdr-image-0.3.0.ebuild 1524 RMD160 f56ccf106b66c674a832fb1bde1e8be2f7950f54 SHA1 992a907491f5823b4bf7f7df355df8011ddad3e2 SHA256 1525e028517d5c96d8857ac3ef583cd7bfa20757bd7aed2f28fbc19c0acdfa95 +MISC ChangeLog 5614 RMD160 870b5137aee6d1a8547d1bf37d5f1065a79fec24 SHA1 119b10f1974e40061680bef84e35c3890a3ad999 SHA256 b3055817b4c8385e377345a0db1306bac7a960cf760d325f19cee986c4fd8253 MISC metadata.xml 435 RMD160 502170f1dbcc66a3742ba91c1790d2e46d7ef6a1 SHA1 e8df8ce5ac5a7cfae27a1e2808d7ae682a89ed0c SHA256 2339bf531037284f03317b33d6fcf743c6ffe74bd48c916e2db2e34c569f6bee -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) Comment: added by hd_brummy@gentoo.org -iD8DBQFNEf7Bdn07HTTCgIoRAtJ6AJ9wodqytCTluFuiz5cuyRt2Der3GACgjZ6+ -7GTwUwpB1jyeEUnG3aCK1Vg= -=9gHY +iD8DBQFNIkcMdn07HTTCgIoRAstmAJ94MMV+IkHUoai28J/z49ed6wTboACeML/O +zeyiAQMEvwcoJSzZjc5UxDY= +=gGyp -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-image/files/ffmpeg-0.4.9_p20080326-new_header.diff b/media-plugins/vdr-image/files/ffmpeg-0.4.9_p20080326-new_header.diff deleted file mode 100644 index 06033e552c79..000000000000 --- a/media-plugins/vdr-image/files/ffmpeg-0.4.9_p20080326-new_header.diff +++ /dev/null @@ -1,27 +0,0 @@ -new ffmpeg header structur -https://bugs.gentoo.org/show_bug.cgi?id=214740 -Joerg Bornkessel <hd_brummy@gentoo.org> 29 Mar 2008 -diff -Naur image-0.2.7.orig/liboutput/encode.c image-0.2.7/liboutput/encode.c ---- image-0.2.7.orig/liboutput/encode.c 2008-03-29 14:56:45.000000000 +0100 -+++ image-0.2.7/liboutput/encode.c 2008-03-29 14:57:06.000000000 +0100 -@@ -31,7 +31,7 @@ - #ifdef FFMDIR - #include <swscale.h> - #else --#include <ffmpeg/swscale.h> -+#include <libswscale/swscale.h> - #endif - #endif - } -diff -Naur image-0.2.7.orig/liboutput/encode.h image-0.2.7/liboutput/encode.h ---- image-0.2.7.orig/liboutput/encode.h 2008-03-29 14:56:45.000000000 +0100 -+++ image-0.2.7/liboutput/encode.h 2008-03-29 14:57:21.000000000 +0100 -@@ -29,7 +29,7 @@ - #ifdef FFMDIR - #include <avcodec.h> - #else --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - #endif - } - diff --git a/media-plugins/vdr-image/files/vdr-image-0.2.7-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.2.7-gentoo.diff deleted file mode 100644 index 6f07df90090d..000000000000 --- a/media-plugins/vdr-image/files/vdr-image-0.2.7-gentoo.diff +++ /dev/null @@ -1,47 +0,0 @@ -diff -Naur image-0.2.5.orig/control-image.c image-0.2.5/control-image.c ---- image-0.2.5.orig/control-image.c 2006-03-06 13:53:36.131134750 +0100 -+++ image-0.2.5/control-image.c 2006-03-06 13:57:06.248266250 +0100 -@@ -617,7 +617,7 @@ - return osContinue; - - // Load additional Commands -- pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "imagecmds.conf")); -+ pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "image/imagecmds.conf")); - - if(pCmd->Count() <= 0) { - delete pCmd; -diff -Naur image-0.2.5.orig/examples/imagecmds.conf image-0.2.5/examples/imagecmds.conf ---- image-0.2.5.orig/examples/imagecmds.conf 2006-03-06 13:53:36.131134750 +0100 -+++ image-0.2.5/examples/imagecmds.conf 2006-03-06 14:10:06.753044750 +0100 -@@ -20,3 +20,5 @@ - Rotate JPEG picture lossless by 90 degrees to the right : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s - Rotate JPEG picture lossless by 90 degrees to the left : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s - Delete picture ?: rm -f %s -+Change burn template : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash -+Change burn template (button) : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash -diff -Naur image-0.2.5.orig/examples/imagecmds.conf.DE image-0.2.5/examples/imagecmds.conf.DE ---- image-0.2.5.orig/examples/imagecmds.conf.DE 2006-03-06 13:53:36.131134750 +0100 -+++ image-0.2.5/examples/imagecmds.conf.DE 2006-03-06 14:09:52.112129750 +0100 -@@ -11,6 +11,8 @@ - Informationen �ber das Bild : identify -verbose - Gr��e des Bildes : du -chs %s - Exif Informationen des JPEG-Bildes ausgeben : jpegtopnm -dumpexif %s >/dev/null 2> $CONVERT_TEMPDIR/exif.tmp && cat $CONVERT_TEMPDIR/exif.tmp && rm -f $CONVERT_TEMPDIR/exif.tmp --Rotatiere JPEG Bildes verlustlos um 90� nach Rechts : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s --Rotatiere JPEG Bildes verlustlos um 90� nach Links : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s -+Rotiere JPEG Bildes verlustlos um 90� nach Rechts : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s -+Rotiere JPEG Bildes verlustlos um 90� nach Links : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s - L�sche Bild ?: rm -f %s -+Hintergrund vdr-burn �ndern : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash -+Button vdr-burn �ndern : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash -diff -Naur image-0.2.5.orig/image.c image-0.2.5/image.c ---- image-0.2.5.orig/image.c 2006-03-06 13:53:36.143135500 +0100 -+++ image-0.2.5/image.c 2006-03-06 13:57:59.203575750 +0100 -@@ -107,7 +107,7 @@ - return false; - } - -- ImageSources.Load(AddDirectory(ConfigDirectory(g_szConfigDirectory), "imagesources.conf")); -+ ImageSources.Load(AddDirectory(ConfigDirectory(g_szConfigDirectory), "image/imagesources.conf")); - if(ImageSources.Count()<1) { - esyslog("imageplugin: you must have defined at least one source in imagesources.conf"); - return false; diff --git a/media-plugins/vdr-image/files/vdr-image-0.2.7-new-ffmpeg.diff b/media-plugins/vdr-image/files/vdr-image-0.2.7-new-ffmpeg.diff deleted file mode 100644 index c4938ff93aa7..000000000000 --- a/media-plugins/vdr-image/files/vdr-image-0.2.7-new-ffmpeg.diff +++ /dev/null @@ -1,309 +0,0 @@ -diff -ru image-0.2.7/data.h image-svn/data.h ---- image-0.2.7/data.h 2006-01-27 22:31:04.000000000 +0100 -+++ image-svn/data.h 2007-07-05 13:00: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 -ru image-0.2.7/exif.c image-svn/exif.c ---- image-0.2.7/exif.c 2006-05-30 19:41:21.000000000 +0200 -+++ image-svn/exif.c 2007-07-05 13:00: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 -ru image-0.2.7/HISTORY image-svn/HISTORY ---- image-0.2.7/HISTORY 2007-01-02 14:56:07.000000000 +0100 -+++ image-svn/HISTORY 2007-07-05 13:00: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 -ru image-0.2.7/liboutput/encode.c image-svn/liboutput/encode.c ---- image-0.2.7/liboutput/encode.c 2006-12-24 13:04:16.000000000 +0100 -+++ image-svn/liboutput/encode.c 2007-07-05 12:59:57.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 -ru image-0.2.7/liboutput/encode.h image-svn/liboutput/encode.h ---- image-0.2.7/liboutput/encode.h 2006-01-11 20:23:30.000000000 +0100 -+++ image-svn/liboutput/encode.h 2007-07-05 12:59:57.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 -diff -ru image-0.2.7/liboutput/Makefile image-svn/liboutput/Makefile ---- image-0.2.7/liboutput/Makefile 2006-01-29 17:04:05.000000000 +0100 -+++ image-svn/liboutput/Makefile 2007-07-05 12:59:57.000000000 +0200 -@@ -9,6 +9,7 @@ - - CXX ?= g++ - CXXFLAGS ?= -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 -ru image-0.2.7/LIESMICH image-svn/LIESMICH ---- image-0.2.7/LIESMICH 2006-01-28 08:06:34.000000000 +0100 -+++ image-svn/LIESMICH 2007-07-05 13:00: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 -ru image-0.2.7/Makefile image-svn/Makefile ---- image-0.2.7/Makefile 2006-08-27 15:51:11.000000000 +0200 -+++ image-svn/Makefile 2007-07-05 13:00: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 -ru image-0.2.7/README image-svn/README ---- image-0.2.7/README 2006-01-14 12:07:29.000000000 +0100 -+++ image-svn/README 2007-07-05 13:00: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 --git a/media-plugins/vdr-image/files/vdr-image-0.2.7.26-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.2.7.26-gentoo.diff deleted file mode 100644 index 76e1e13ac00e..000000000000 --- a/media-plugins/vdr-image/files/vdr-image-0.2.7.26-gentoo.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff -Naur image-0.2.7.26.orig/control-image.c image-0.2.7.26/control-image.c ---- image-0.2.7.26.orig/control-image.c 2008-10-25 23:48:18.000000000 +0200 -+++ image-0.2.7.26/control-image.c 2008-10-25 23:49:01.000000000 +0200 -@@ -606,7 +606,7 @@ - return osContinue; - - // Load additional Commands -- pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "imagecmds.conf")); -+ pCmd->Load(AddDirectory(cPlugin::ConfigDirectory(g_szConfigDirectory), "image/imagecmds.conf")); - - if(pCmd->Count() <= 0) { - delete pCmd; -diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf image-0.2.7.26/examples/imagecmds.conf ---- image-0.2.7.26.orig/examples/imagecmds.conf 2008-10-25 23:48:18.000000000 +0200 -+++ image-0.2.7.26/examples/imagecmds.conf 2008-10-25 23:50:53.000000000 +0200 -@@ -20,3 +20,5 @@ - Rotate JPEG picture lossless by 90 degrees to the right : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s - Rotate JPEG picture lossless by 90 degrees to the left : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s - Delete picture ?: rm -f %s -+Change burn template : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash -+Change burn template ( Button ) : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash -\ Kein Zeilenumbruch am Dateiende. -diff -Naur image-0.2.7.26.orig/examples/imagecmds.conf.DE image-0.2.7.26/examples/imagecmds.conf.DE ---- image-0.2.7.26.orig/examples/imagecmds.conf.DE 2008-10-25 23:48:18.000000000 +0200 -+++ image-0.2.7.26/examples/imagecmds.conf.DE 2008-10-25 23:55:49.000000000 +0200 -@@ -11,6 +11,8 @@ - Informationen �ber das Bild : identify -verbose - Gr��e des Bildes : du -chs %s - Exif Informationen des JPEG-Bildes ausgeben : jpegtopnm -dumpexif %s >/dev/null 2> $CONVERT_TEMPDIR/exif.tmp && cat $CONVERT_TEMPDIR/exif.tmp && rm -f $CONVERT_TEMPDIR/exif.tmp --Rotatiere JPEG Bildes verlustlos um 90� nach Rechts : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s --Rotatiere JPEG Bildes verlustlos um 90� nach Links : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s -+Rotiere JPEG Bildes verlustlos um 90� nach Rechts : jpegtran -rotate 90 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s -+Rotiere JPEG Bildes verlustlos um 90� nach Links : jpegtran -rotate 270 %s > $CONVERT_TEMPDIR/tmp.jpg && mv $CONVERT_TEMPDIR/tmp.jpg %s - L�sche Bild ?: rm -f %s -+Hintergrund vdr-burn ändern : echo ln -fs '%s' '/usr/share/vdr/burn/menu-bg.png' | /bin/bash -+Button vdr-burn ändern : echo ln -fs '%s' '/usr/share/vdr/burn/menu-button.png' | /bin/bash -diff -Naur image-0.2.7.26.orig/image.c image-0.2.7.26/image.c ---- image-0.2.7.26.orig/image.c 2008-10-25 23:48:18.000000000 +0200 -+++ image-0.2.7.26/image.c 2008-10-25 23:53:43.000000000 +0200 -@@ -102,7 +102,7 @@ - return false; - } - -- cString szConfSource = AddDirectory(ConfigDirectory(g_szConfigDirectory), "imagesources.conf"); -+ cString szConfSource = AddDirectory(ConfigDirectory(g_szConfigDirectory), "image/imagesources.conf"); - ImageSources.Load(szConfSource); - if(ImageSources.Count()<1) { - const char* sz = szConfSource; diff --git a/media-plugins/vdr-image/vdr-image-0.3.0.ebuild b/media-plugins/vdr-image/vdr-image-0.3.0.ebuild index c504b6f591ff..202bd69fa0e1 100644 --- a/media-plugins/vdr-image/vdr-image-0.3.0.ebuild +++ b/media-plugins/vdr-image/vdr-image-0.3.0.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.3.0.ebuild,v 1.5 2010/12/22 13:35:18 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.3.0.ebuild,v 1.6 2011/01/03 21:58:14 hd_brummy Exp $ + +EAPI="2" inherit vdr-plugin eutils flag-o-matic @@ -8,7 +10,7 @@ DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp" HOMEPAGE="http://vdr-image.berlios.de/" SRC_URI="mirror://berlios/${PN}/${P}.tar.gz" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" SLOT="0" LICENSE="GPL-2" IUSE="exif" @@ -27,15 +29,17 @@ RDEPEND="${COMMON_DEPEND} VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.0.sh" BUILD_PARAMS="-j1" -src_unpack() { - vdr-plugin_src_unpack +src_prepare() { + vdr-plugin_src_prepare epatch "${FILESDIR}/${P}-gentoo.diff" use !exif && sed -i "s:#WITHOUT_LIBEXIF:WITHOUT_LIBEXIF:" Makefile + if has_version "<=media-video/ffmpeg-0.4.9_p20061016"; then BUILD_PARAMS="${BUILD_PARAMS} WITHOUT_SWSCALER=1" fi + # UINT64_C is needed by ffmpeg headers append-flags -D__STDC_CONSTANT_MACROS } |