diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-plugins/vdr-image/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-plugins/vdr-image/files')
4 files changed, 110 insertions, 0 deletions
diff --git a/media-plugins/vdr-image/files/rc-addon-0.3.0.sh b/media-plugins/vdr-image/files/rc-addon-0.3.0.sh new file mode 100644 index 000000000000..f4030e082ab8 --- /dev/null +++ b/media-plugins/vdr-image/files/rc-addon-0.3.0.sh @@ -0,0 +1,22 @@ +# $Id$ +# +# rc-addon plugin-startup-skript for vdr-image +# + +: ${IMAGE_MOUNT:=/usr/share/vdr/image/bin/mount-image.sh} +: ${IMAGE_CONVERT:=/usr/share/vdr/image/bin/imageplugin.sh} + +plugin_pre_vdr_start() { + add_plugin_param "-m ${IMAGE_MOUNT}" + add_plugin_param "-C ${IMAGE_CONVERT}" + add_plugin_param "-c image" + + if [ -f /usr/lib/vdr/inc/commands-functions.sh ]; then + . /usr/lib/vdr/inc/commands-functions.sh + else + #source /usr/share/vdr/inc/functions.sh + include commands-functions + fi + + merge_commands_conf /etc/vdr/imagecmds /etc/vdr/plugins/image/imagecmds.conf "${ORDER_IMAGECMDS}" +} diff --git a/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch b/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch new file mode 100644 index 000000000000..78fd1d384435 --- /dev/null +++ b/media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch @@ -0,0 +1,40 @@ +diff -urN image-0.3.1.old/liboutput/encode.c image-0.3.1/liboutput/encode.c +--- image-0.3.1.old/liboutput/encode.c 2013-06-17 21:23:23.308430203 +0200 ++++ image-0.3.1/liboutput/encode.c 2013-06-17 21:27:37.126421173 +0200 +@@ -49,7 +49,6 @@ + + bool cEncode::Register() + { +- avcodec_init(); + #if 0 + // XXX to resolv: dosen't work with osdpip + register_avcodec(&mpeg2video_encoder); +@@ -100,7 +99,7 @@ + AVCodecContext *pAVCC = NULL; + AVFrame *pAVF = NULL; + +- pAVCC = avcodec_alloc_context(); ++ pAVCC = avcodec_alloc_context3(NULL); + if (! pAVCC) + { + esyslog("imageplugin: Failed to alloc memory for AVCodecContext."); +@@ -116,7 +115,7 @@ + { + SetupEncodingParameters(pAVCC); + +- if (avcodec_open(pAVCC, m_pavCodec) < 0) ++ if (avcodec_open2(pAVCC, m_pavCodec, NULL) < 0) + { + esyslog("imageplugin: Couldn't open Codec."); + } +diff -urN image-0.3.1.old/liboutput/encode.h image-0.3.1/liboutput/encode.h +--- image-0.3.1.old/liboutput/encode.h 2013-06-17 21:23:23.308430203 +0200 ++++ image-0.3.1/liboutput/encode.h 2013-06-17 21:27:37.127421173 +0200 +@@ -14,6 +14,7 @@ + + extern "C" { + #include <libavcodec/avcodec.h> ++#include <libavutil/mem.h> + } + + #include "../setup-image.h" diff --git a/media-plugins/vdr-image/files/vdr-image-0.3.1-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.3.1-gentoo.diff new file mode 100644 index 000000000000..11479f2fc8a2 --- /dev/null +++ b/media-plugins/vdr-image/files/vdr-image-0.3.1-gentoo.diff @@ -0,0 +1,24 @@ +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 --git a/media-plugins/vdr-image/files/vdr-image-0.4.0-gentoo.diff b/media-plugins/vdr-image/files/vdr-image-0.4.0-gentoo.diff new file mode 100644 index 000000000000..11479f2fc8a2 --- /dev/null +++ b/media-plugins/vdr-image/files/vdr-image-0.4.0-gentoo.diff @@ -0,0 +1,24 @@ +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 |