From: Joerg Bornkessel Date: Sun, 8 Feb 2015 11:01:06 +0000 (+0000) Subject: bump; cleanup X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d13ff1adda77f26a6670b1b063bee18aa7195e4c;p=gentoo.git bump; cleanup Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x34C2808A --- diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog index d7ee94db7e68..12ed1b92ccf3 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-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.44 2014/01/08 12:51:51 hd_brummy Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.45 2015/02/08 11:00:57 hd_brummy Exp $ + +*vdr-image-0.4.0 (08 Feb 2015) + + 08 Feb 2015; Joerg Bornkessel +vdr-image-0.4.0.ebuild, + +files/vdr-image-0.4.0-gentoo.diff, -files/rc-addon.sh: + bump; cleanup 08 Jan 2014; Joerg Bornkessel -files/vdr-image-0.3.0-gentoo.diff: diff --git a/media-plugins/vdr-image/Manifest b/media-plugins/vdr-image/Manifest index 05157620187f..250b3da90b82 100644 --- a/media-plugins/vdr-image/Manifest +++ b/media-plugins/vdr-image/Manifest @@ -2,18 +2,20 @@ Hash: SHA256 AUX rc-addon-0.3.0.sh 712 SHA256 713cd7048618c14e63b78da9921e9e178b3860adb5a6deea7808471363b4b766 SHA512 33cc5ed0be638f00c1b3ac7f89a8e6b88c6e5196c7439355e71e6f0919c1f1871fb2033eecd11c4512cc11ddf7d4d58acb178c782fc85bf9899172b772f97880 WHIRLPOOL 3a8ce83b3802834a2778b4c3a36f88b27f8493834affd80ffe7dfb5da2cb40f14a6a45445f413ee65bd9997288a730ba96eebdb31ee68fe85325a159bb6678ac -AUX rc-addon.sh 672 SHA256 1d8a77095882d5b63ddeec7b422cd775b883b8ade3504a22e79d2e463f3eeb17 SHA512 2e7e08dc8f5e5e2efac78cf2a849172cfdfefa606c26bb817e8163abbd07690aada62707f8160df5911350acb722585b2e8934a26fe42d925a32d5438274823a WHIRLPOOL 50eb1f701867804072de6f062d08b9fb6ad5dff528f98b0192ec22b6a2f718380a75972e15394d654207154398e68949969a4581350ab01e0139d638bd0f0579 AUX vdr-image-0.3.1-ffmpeg-1.patch 1307 SHA256 50778e97a4186d462248a5c014a8f6d4065beb341659bb773bec7b64c0347de5 SHA512 ffc0e3f130f0f30b5ac2f5055ba9fbc91d9f67ae855da3ff8c26408ae24ee55e0027d7c086f24d94fe341c0f3764c24e1980a4f5408ffad927621c3697e5c825 WHIRLPOOL c708413afa0615e32e2f2479f2c44ffd8dc0b443bc5582d959367628063c5918c58fa528418517d28ce1ef2d0b3faaec6c44632043376a390b861938d0fe8c27 AUX vdr-image-0.3.1-gentoo.diff 2348 SHA256 45024beab8174cdd2ac6f0a880fb1a5cefabdfd2781ef8511d71e49592e0357e SHA512 ca6932ae0da10bf1037297dfe4eb1b667ecf78d660479fe332e474746cc1b2afcb6d1a048c511735d5e354dbd8867ee68be75a010eb31fd132382869dd98025c WHIRLPOOL 706b19f7420b8b4f115ac20aba34260884cd8c7393a38b9f1c8afb0190d3130f5b24413be3d2e27cfdc71ea30a2be708530a697967744eefd31a1dd43ac3f929 +AUX vdr-image-0.4.0-gentoo.diff 2348 SHA256 45024beab8174cdd2ac6f0a880fb1a5cefabdfd2781ef8511d71e49592e0357e SHA512 ca6932ae0da10bf1037297dfe4eb1b667ecf78d660479fe332e474746cc1b2afcb6d1a048c511735d5e354dbd8867ee68be75a010eb31fd132382869dd98025c WHIRLPOOL 706b19f7420b8b4f115ac20aba34260884cd8c7393a38b9f1c8afb0190d3130f5b24413be3d2e27cfdc71ea30a2be708530a697967744eefd31a1dd43ac3f929 DIST vdr-image-0.3.1.tar.gz 124587 SHA256 953c27a6fbebb17590cc6ffe367720d92fb0f256da934bd06bd86aabfaa8e15b SHA512 a5a3b9d29958abc486d5fce4a6423d574894a604f792fe6e73b49daf3c02fe2df1ec7d7538db2a950482a77c7d47ebd8dd498ae55f265a0a7ef013b607dd0efb WHIRLPOOL 6541b2a1f1a7e8da241878d46c0976b2d688522c2143a2d66e6c2b124343a068b000bd2a2df647bd82db858ec73e3db136ea61f77fba28d5369fcbce5dd3d1bb +DIST vdr-image-0.4.0.tgz 129200 SHA256 45b9d550698a8871e54c53ca594d0fe81bd4b03b273d106c1dfbdc728a2aa68c SHA512 d66bb7ff48ed622ec21a7d828985229b6aaf908123c12b870e531f09dfe85e792afafa096cd5c4580296139275e2f7171d30f21fe1f8d88978e19c1eb36ab169 WHIRLPOOL 9a7930bf562eac1ba12b204c7f578fc202b453cc28f1a1c84e449eed05587adc0e4c17ec46214ebe8602ddaff3ec9e6214e2ff334247d8d181302ff491ab62d2 EBUILD vdr-image-0.3.1.ebuild 1723 SHA256 4a75894abca07990ffab739c810d9974f51e1ecec40ec3f8060b5023a4d10c2c SHA512 134d9a4c0290dc5080e56d1f9726d5442ea9eef48025dcba06806432bc472da3599a2d67fba14c2977c692a80bc82c3cc7afea3993feaf05c4b055ebfbad2a01 WHIRLPOOL db644b45f7355253fba9d8681fd9dae323de140f2c58ebf9da943e7f8f8ffbdab76094abfe8c204cb264736429a4a5477b08e8b66ae12f28704bc821d50031ad -MISC ChangeLog 7286 SHA256 1ddd86a06bc140216a9df60ca91808ed5494ff1c86f545b7ceae0dbdde50a856 SHA512 4ce01fb208e1552746a5c6c3c479d19488fae5378d17112c31baa9cd9968cfaad64b0ae8cad46ce7ade00642bc2a3206a407d68f8561bd20f501130978f642fe WHIRLPOOL c21c5b86e80e19647cdfedc59fe8394e49506b174d45eb1bc2a176172e3eff20d2cdc2f920369d7a28a58bfec9f7807e14c163ec3604d0fc72a6d1716640ab45 +EBUILD vdr-image-0.4.0.ebuild 1606 SHA256 9fee961782a2987a3394c6e5f8cbac06a141042bb4caf9612e3e32f3b5b7aa3a SHA512 080815a61ae1575779426daf4ace226a915e33c514041491a0b8383a4b685da5e6ff02b3e6634852741e3594ff55cbcd04e464d90b1b26ead79dfeb88ba6c88e WHIRLPOOL 95500860c809dd3b3a6262c51a684ce474dc1744e834954b16fbf104ff9400adff1f9bc0d0d7f21af6176407a33a1400b90cfe46cc6991be1211b09d4c73b7de +MISC ChangeLog 7473 SHA256 19de865f82a04bc0ab5e6b0b654fec9be0bee5c91e0b4bed312b326313476f4a SHA512 42d3128dcc45c53ecd054e611a2a277f02cc166ac3cd8fdb8e21d8722895a2eadaf67022f1991c7115da24cba2a59fd47aad8a1f4712f9132df7a89f07d615cd WHIRLPOOL 8d4daf6d490a7015d4c097bbe4445af92ae6a9886df89c2dff99b388fdcfb30edcc28315d9e539db7cfe1ddcb01852fb04126458a1493743630b8ff81b509c3d MISC metadata.xml 435 SHA256 2339bf531037284f03317b33d6fcf743c6ffe74bd48c916e2db2e34c569f6bee SHA512 a92e61c4fda550adf44941a5acc4e9a9bd2a7f7de3e54857c619725a5cc88d3e1fc84ff99584377e2e4062677ed222d92cb8ca926404a118aa8552090f9fda6d WHIRLPOOL 48698d6ba1267dc029dc15061ed9e841b8664fbe6e66e27a331ebb51699910d69a47c93cb498863bbcd367de6e86e5892223eec80002ef1ba82ed54affcf3c1e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) Comment: added by hd_brummy@gentoo.org -iD8DBQFSzUnodn07HTTCgIoRCCwSAJ9lKfJftMTbXH/2WLID23LcFipQsQCdGjH5 -Pyhtmdmyn9N2B/L5UCqpEmc= -=R32h +iD8DBQFU10Hvdn07HTTCgIoRCH7dAJ0Sg7GlzD7hF1mGe460J7b9jtYBMACfUmVN +VuS12cvt7b3KfEtZ6dKe4VM= +=HDfW -----END PGP SIGNATURE----- diff --git a/media-plugins/vdr-image/files/rc-addon.sh b/media-plugins/vdr-image/files/rc-addon.sh deleted file mode 100644 index a70848daf0d0..000000000000 --- a/media-plugins/vdr-image/files/rc-addon.sh +++ /dev/null @@ -1,21 +0,0 @@ -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/files/rc-addon.sh,v 1.4 2007/04/17 09:45:24 zzam Exp $ -# -# 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}" - - 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.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 diff --git a/media-plugins/vdr-image/vdr-image-0.4.0.ebuild b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild new file mode 100644 index 000000000000..a1b0c75b1c5e --- /dev/null +++ b/media-plugins/vdr-image/vdr-image-0.4.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2015 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.4.0.ebuild,v 1.1 2015/02/08 11:00:57 hd_brummy Exp $ + +EAPI=5 + +inherit vdr-plugin-2 + +VERSION="1325" #every bump, new version + +DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp" +HOMEPAGE="http://projects.vdr-developer.org/projects/plg-image" +SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz" + +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="GPL-2" +IUSE="exif" + +COMMON_DEPEND=">=media-video/vdr-2 + >=virtual/ffmpeg-9 + >=media-libs/netpbm-10.0 + exif? ( media-libs/libexif )" + +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig" + +RDEPEND="${COMMON_DEPEND} + media-tv/gentoo-vdr-scripts" + +VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.0.sh" + +src_prepare() { + vdr-plugin-2_src_prepare + + #wrong include + sed -e 's::"liboutput/stillimage-player.h":'\ + -i player-image.h + + # dangerous warning + sed -e "s:mktemp:mkstemp:" -i data-image.c + + epatch "${FILESDIR}/${P}-gentoo.diff" + + # ffmpeg-2.2.12, libav10 + sed -e "s:avcodec_alloc_frame:av_frame_alloc:" \ + -e "s:CODEC_ID_MPEG2VIDEO:AV_CODEC_ID_MPEG2VIDEO:" \ + -i liboutput/encode.c +} + +src_install() { + vdr-plugin-2_src_install + + insinto /etc/vdr/imagecmds + newins examples/imagecmds.conf imagecmds.example.conf + newins examples/imagecmds.conf.DE imagecmds.example.conf.de + + insinto /etc/vdr/plugins/image + doins examples/imagesources.conf + + into /usr/share/vdr/image + dobin scripts/imageplugin.sh + newbin scripts/mount.sh mount-image.sh +}