[proaudio] [2571] media-video/xjadeo-0.6.4: add more use flags, add patch to not link against non-existing library, install more tools, minor cleanup

[subversion@xxxxxxxxxxxxx]

Revision: 2571
Author:   lilrc
Date:     2013-03-24 09:12:08 +0100 (Sun, 24 Mar 2013)
Log Message:
-----------
media-video/xjadeo-0.6.4: add more use flags, add patch to not link against non-existing library, install more tools, minor cleanup

Modified Paths:
--------------
    trunk/overlays/proaudio/media-video/xjadeo/ChangeLog
    trunk/overlays/proaudio/media-video/xjadeo/Manifest
    trunk/overlays/proaudio/media-video/xjadeo/metadata.xml
    trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.6.4.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-video/xjadeo/files/xjadeo-0.6.4-no-libporttime.patch

Removed Paths:
-------------
    trunk/overlays/proaudio/media-video/xjadeo/files/xjadeo-0.4.1-use_sws_scale.patch

Modified: trunk/overlays/proaudio/media-video/xjadeo/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/ChangeLog	2013-03-23 18:18:06 UTC (rev 2570)
+++ trunk/overlays/proaudio/media-video/xjadeo/ChangeLog	2013-03-24 08:12:08 UTC (rev 2571)
@@ -2,6 +2,15 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Mar 2013; Karl Linden (lilrc) <lilrc@xxxxxxxxxxxxxxxxxxxxx>
+  -files/xjadeo-0.4.1-use_sws_scale.patch, xjadeo-0.6.4.ebuild,
+  +files/xjadeo-0.6.4-no-libporttime.patch, metadata.xml:
+  Add alsa, portmidi, midi, osc and imlib USE flags.
+  Install more tools when tools flag is enabled.
+  Remove redundancy in description.
+  Remove obsolete patch.
+  Add patch to disable linking against non-existing libporttime.
+
   08 Mar 2013; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
   yjadeo-0.6.4.ebuild: moved depend to dev-qt/*
 

Modified: trunk/overlays/proaudio/media-video/xjadeo/Manifest
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/Manifest	2013-03-23 18:18:06 UTC (rev 2570)
+++ trunk/overlays/proaudio/media-video/xjadeo/Manifest	2013-03-24 08:12:08 UTC (rev 2571)
@@ -1,5 +1,5 @@
-AUX xjadeo-0.4.1-use_sws_scale.patch 3230 SHA256 fd9c2067ee1e3e542c05a578fdc231061c1d3f092e12763f3b3ca0e4e1a01e90 SHA512 53338ce4cf799e81f8f3ecd1deac63bb8e4867b45f9f314d26944266b4fd4339285001c6edfb699872ac587af256d383ec93262cbb83309f7b609784dec92963 WHIRLPOOL 14dc5d455b08222d44738debf767966a37b3b70c39fbeefb6468fea603b2bc048c404221679f1ce39159f5295a43b3a81baf209becc1565dd5f3bb6b6ee29d18
+AUX xjadeo-0.6.4-no-libporttime.patch 486 SHA256 0946e202642bc4745f9a4fef31b9d81cee51524442da4b789823c58f3fed93e4 SHA512 eba580fac32f513be386c3ac6ad0b652a23c5e268a9647a732ad341da7f48e1829de46fc2313a2f85ac6c2ac8631b80cf3a2a09efe386cb3eb1ae78bb51b38aa WHIRLPOOL ea3f1cfe91e7a57f37a830b70fa026d02634218d590fb1aaae755e9bca9bff344e818f93edb985b0561c3cd11406ad0bd9e20c526b4132700b7ca111df336c09
 DIST xjadeo-0.6.4.tar.gz 347279 SHA256 cccc6e00436eaba3b8d82ef3445e39f89a6b2920f2dc3aaf6b1c9fd2767e49b1 SHA512 e41693a668f4a4cafc1458522dd263167a227d0d05b0160720f20765fd7b58e3128d37d08e1f36e098d0f61a2a8545497d8c08c635e6237cf41fc2e2d2471603 WHIRLPOOL a05672d1af1ea692e3e472a4921b600a211b75a529a4091fe18269087a40060b00e00cff9b8965a218217ada5854e4651099a80431ca9bb5e6d02f73e7c8ffc9
-EBUILD xjadeo-0.6.4.ebuild 1412 SHA256 e9a5b41b6997f9543acd2988ef7b390b8312750b42d24cd713c6f297f1000e1f SHA512 20fc553e78fa92e119211c8bfb708ced6846c20fc352dc7c41c65dbe6c721d4cc7d5c7a3a10c0dbb9dc531e7e00e475630b64ebcff1428cd74c92f641c18a41a WHIRLPOOL ce0c585c174d188e194e9624700636f8a8deec97cdfe289527c74debcff3ad443dee318ff45b8ff3ecaf893866f1947d04ce464a9f6981031a9403bfbda14f9f
-MISC ChangeLog 1030 SHA256 2088978891791a27b5a679444dc1630bca63de4961fe9a33a69b68ad5b8a3b4a SHA512 ba6c97f8b502e61c3447f29bd284bc86dbe3006ecdc19ace4d31cc5bfc46fd9959d0fe2ef41b0837138c7b6cf47a387c8668f2dadc7d41642dd6df26734d40db WHIRLPOOL 8cb8a9c3469df5d1f191274cb32063f4b306e4b63259845c01b4503ef62438c242a701b45cdcbbe4ca13ec093c74eb4e818dc656f8f1bdf87dcb0af1a7ae64e8
-MISC metadata.xml 386 SHA256 4fb1c16cfb33cd5fc79f599abe68ae5cc97802439ccce09bbb03611cd14d6313 SHA512 51364c8f555604e31e4532fa0c7a026a4bee536297e768439ba02d3edb84bde9867c0cdf211c780b4df54b10da47a3c1a6cbf050b86c7667046d89f2ab6e4db2 WHIRLPOOL 92eec8593cce3c226bea5815db5218ac5983da102eb7e8adf3883c6c01b1d6aef73a1edf921345f9703f6d594bd39964a60383320bd87b27ef97fc99716599c8
+EBUILD xjadeo-0.6.4.ebuild 1914 SHA256 27f1c9c11fc819d39b2df1d74366d20e85472f26244da2910aa28e823e144723 SHA512 01d70c942022f822866ce92f7fd0a99c82f5f30a174d8639d8ebda74a8a8627232d6094e1048cc8d00d748836c974e968dbc05ca235a7af35b85208bc286d644 WHIRLPOOL f8ae8bb664956c27506b71a01a896a361eb60aebfced03480fa9e47f8a43ff207326fefa754fba9c876a648326b83e2602b64af2837d5fcba32e9de7bc2e659c
+MISC ChangeLog 1446 SHA256 58386032f141ba99854005e35afa64c90238cbedb5250b35aa08ac7b74a25047 SHA512 636d5182bb20457a96189cdc5071744ecc1ee177131e08ddae36c78f6c39aefd718969cd69115190e3307990559bc85baacd6c1484d3c98243db09fae803694b WHIRLPOOL f8d7a106a9241be6281877fac5e5d13543bd0dc731d4daf2dac974782be16d43113d1254414bdb2559e62977ebca80c811d3ea3c483769d336499ad93369cbd5
+MISC metadata.xml 527 SHA256 456d23ab04ebfc737c44421012bb8672d433290417aa396e5013e17126a36cc0 SHA512 9b1b99bf9649821b5a6cd6e84636141b45b789b3e5b6b7628546dc9202fa31bcef93f6a0a2882d24ce3191b66c91ce90c13847634cfbc48f751f38bd2c4c5434 WHIRLPOOL 6443aaa97c4ceb6a30631a878bc0c2b036732174eab47e381da0be0a462ab16bb15497fa9ec94f49b123a46413c06074732ae11e3a0853d5812df8642ec0707b

Deleted: trunk/overlays/proaudio/media-video/xjadeo/files/xjadeo-0.4.1-use_sws_scale.patch
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/files/xjadeo-0.4.1-use_sws_scale.patch	2013-03-23 18:18:06 UTC (rev 2570)
+++ trunk/overlays/proaudio/media-video/xjadeo/files/xjadeo-0.4.1-use_sws_scale.patch	2013-03-24 08:12:08 UTC (rev 2571)
@@ -1,94 +0,0 @@
-diff -urN xjadeo-0.4.1_old/configure.ac xjadeo-0.4.1/configure.ac
---- xjadeo-0.4.1_old/configure.ac	2007-06-16 18:53:10.000000000 +0200
-+++ xjadeo-0.4.1/configure.ac	2007-11-24 11:44:02.000000000 +0100
-@@ -126,6 +126,7 @@
- AH_TEMPLATE([COLOREQ], [enable XV and imlib2 color equalizer])
- AH_TEMPLATE([DRAW_CROSS], [paint a X on screen when unable to decode or display a frame.])
- AH_TEMPLATE([HAVE_JACK_VIDEO], [experimental code to use jack_video, jack-svn >= r591])
-+AH_TEMPLATE([HAVE_SWSCALE], [Define as 1 if you have ffmpeg with swscale support])
- 
- AC_DEFINE(CFG_WARN_ONLY)
- AC_DEFINE(DND)
-@@ -289,6 +290,12 @@
- 	])
- fi
- 
-+
-+ac_save_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $FFMPEG_CFLAGS"
-+AC_CHECK_HEADERS(swscale.h , [HAVE_SWSCALE=1 AC_DEFINE(HAVE_SWSCALE) FFMPEG_LIBS="$FFMPEG_LIBS  `pkg-config --libs libswscale`"])
-+CFLAGS="$ac_save_CFLAGS"
-+
- AC_SUBST(FFMPEG_CFLAGS)
- AC_SUBST(FFMPEG_LIBS)
- 
-diff -urN xjadeo-0.4.1_old/debian/changelog xjadeo-0.4.1/debian/changelog
---- xjadeo-0.4.1_old/debian/changelog	2007-06-16 18:58:16.000000000 +0200
-+++ xjadeo-0.4.1/debian/changelog	2007-11-24 11:44:02.000000000 +0100
-@@ -1,3 +1,8 @@
-+xjadeo (0.4.2) unstable; urgency=low
-+  * added ffmpeg swscale support
-+
-+ -- Robin Gareus <robin@xxxxxxxxxx>  Wed, 12 Sep 2007 01:56:14 +0200
-+
- xjadeo (0.4.1) unstable; urgency=low
-   * default black-YUV frame
-   * minor updates in the manual.
-diff -urN xjadeo-0.4.1_old/src/xjadeo/xjadeo.c xjadeo-0.4.1/src/xjadeo/xjadeo.c
---- xjadeo-0.4.1_old/src/xjadeo/xjadeo.c	2007-06-16 18:57:11.000000000 +0200
-+++ xjadeo-0.4.1/src/xjadeo/xjadeo.c	2007-11-24 11:44:02.000000000 +0100
-@@ -33,8 +33,12 @@
-  */
- #include "xjadeo.h"
- 
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
-+#include <avcodec.h>
-+#include <avformat.h>
-+#ifdef HAVE_SWSCALE
-+#include <avutil.h>
-+#include <swscale.h>
-+#endif
- 
- #include <time.h>
- #include <getopt.h>
-@@ -55,6 +59,7 @@
- extern AVFrame           *pFrame;
- extern AVFrame           *pFrameFMT;
- extern uint8_t           *buffer;
-+struct SwsContext *pSWSCtx; 
- 
- // needs to be set before calling movie_open
- extern int	render_fmt;
-@@ -213,6 +218,7 @@
- // Assign appropriate parts of buffer to image planes in pFrameFMT
- 	if (pFrameFMT)
- 		avpicture_fill((AVPicture *)pFrameFMT, buffer, render_fmt, pCodecCtx->width, pCodecCtx->height);
-+	pSWSCtx = sws_getContext(pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt, pCodecCtx->width, pCodecCtx->height, render_fmt, SWS_BICUBIC, NULL, NULL, NULL);
- 	render_empty_frame(0);
- }
- 
-@@ -657,10 +663,13 @@
- 			/* Did we get a video frame? */
- 			if(frameFinished) {
- 				/* Convert the image from its native format to FMT */
-+#ifdef HAVE_SWSCALE
-+				sws_scale(pSWSCtx, pFrame->data, pFrame->linesize, 0, pCodecCtx->height, pFrameFMT->data, pFrameFMT->linesize);
-+#else
- 				img_convert((AVPicture *)pFrameFMT, render_fmt, 
- 					(AVPicture*)pFrame, pCodecCtx->pix_fmt, pCodecCtx->width, 
- 					pCodecCtx->height);
--
-+#endif
- 				render_buffer(buffer); // in pFrameFMT
- 				av_free_packet(&packet); /* XXX */
- 				break;
-@@ -692,6 +701,8 @@
- 	current_file=NULL;
- 
- 	if (!pFrameFMT) return(-1);
-+	// Free the software scaler
-+	sws_freeContext(pSWSCtx); 
- 
- 	// Free the formatted image 
- 	if(buffer) free(buffer);

Added: trunk/overlays/proaudio/media-video/xjadeo/files/xjadeo-0.6.4-no-libporttime.patch
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/files/xjadeo-0.6.4-no-libporttime.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-video/xjadeo/files/xjadeo-0.6.4-no-libporttime.patch	2013-03-24 08:12:08 UTC (rev 2571)
@@ -0,0 +1,13 @@
+diff -Naur xjadeo-0.6.4.orig/configure.ac xjadeo-0.6.4/configure.ac
+--- xjadeo-0.6.4.orig/configure.ac	2013-03-24 08:28:16.733866229 +0100
++++ xjadeo-0.6.4/configure.ac	2013-03-24 08:30:50.578861156 +0100
+@@ -226,9 +226,6 @@
+ 	fi
+ 	if test "x$FOUND_H_PORTMIDI$FOUND_L_PORTMIDI" = "xyesyes"; then
+ 		MIDI_LIBS="-lportmidi"
+-		if test "$PM_OS" != "mac"; then
+-		  MIDI_LIBS="${MIDI_LIBS} -lporttime"
+-	  fi
+ 	fi
+ 
+ 	if test "x$PORTMIDI" != "xno" -a -n "$portmidisrc" -a -n "$PM_OS"; then

Modified: trunk/overlays/proaudio/media-video/xjadeo/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/metadata.xml	2013-03-23 18:18:06 UTC (rev 2570)
+++ trunk/overlays/proaudio/media-video/xjadeo/metadata.xml	2013-03-24 08:12:08 UTC (rev 2571)
@@ -6,7 +6,9 @@
 		<name>pro-audio overlay team</name>
 	</maintainer>
 	<use>
+		<flag name="midi">Adds support for MIDI</flag>
 		<flag name="osd">Freetype On-Screen.Display support</flag>
+		<flag name="portmidi">Adds support for MIDI through <pkg>media-libs/portmidi</pkg></flag>
 		<flag name="tools">Install contrib code and an example</flag>
 	</use>
 </pkgmetadata>

Modified: trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.6.4.ebuild
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.6.4.ebuild	2013-03-23 18:18:06 UTC (rev 2570)
+++ trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.6.4.ebuild	2013-03-24 08:12:08 UTC (rev 2571)
@@ -4,22 +4,28 @@
 
 EAPI="5"
 
-inherit versionator flag-o-matic autotools-utils
+inherit versionator autotools-utils
 MY_P="${PN}-$(replace_version_separator "3" ".")"
-DESCRIPTION="xjadeo is a simple video player that is synchronized to jack transport."
-HOMEPAGE="http://xjadeo.sourceforge.net/";
+DESCRIPTION="a simple video player that is synchronized to jack transport."
+HOMEPAGE="http://${PN}.sourceforge.net/";
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="xv sdl osd qt4 tools lash tiff"
+IUSE="alsa imlib lash midi osc osd qt4 portmidi sdl tiff tools xv"
+REQUIRED_USE="alsa? ( midi )
+	portmidi? ( midi )"
 
 RDEPEND=">=media-sound/jack-audio-connection-kit-0.100
 	>=media-video/ffmpeg-0.4.9
-	>=media-libs/alsa-lib-1.0.10
-	>=media-libs/imlib2-1.3.0
+	midi? (
+		alsa? ( >=media-libs/alsa-lib-1.0.10 )
+		portmidi? ( media-libs/portmidi )
+	)
+	imlib? ( >=media-libs/imlib2-1.3.0 )
 	lash? ( virtual/liblash )
+	osc? ( media-libs/liblo )
 	sdl? ( >=media-libs/libsdl-1.2.8 )"
 
 DEPEND="${RDPEND}
@@ -29,6 +35,9 @@
 	)
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-no-libporttime.patch" )
+
+AUTOTOOLS_AUTORECONF="1"
 AUTOTOOLS_IN_SOURCE_BUILD="1"
 
 DOCS=( AUTHORS ChangeLog TODO README NEWS )
@@ -36,23 +45,36 @@
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
-	local myeconfargs=(	$(use_enable xv) \
-						$(use_enable sdl) \
-						$(use_enable osd ft) \
-						$(use_enable tools contrib) \
-						$(use_enable lash) \
-						$(use_enable tiff) \
-						$(use_enable qt4 qtgui) \
-						--enable-imlib2 \
-						--without-portmidisrc \
+	local myeconfargs=(
+		$(use_enable imlib imlib2)
+		$(use_enable lash)
+		$(use_enable midi)
+		$(use_enable osc)
+		$(use_enable osd ft)
+		$(use_enable qt4 qtgui)
+		$(use_enable sdl)
+		$(use_enable tiff)
+		$(use_enable tools contrib)
+		$(use_enable xv)
 	)
 
+	use alsa || export ALSAMIDI="no"
+	use portmidi || export PORTMIDI="no"
+
 	autotools-utils_src_configure
 }
 
 src_install() {
 	autotools-utils_src_install
-	use tools && newdoc contrib/README README-tools
-	insinto /usr/share/${PN}
-	use tools && doins contrib/xjadeo-example.avi
+	if use tools; then
+		newdoc contrib/README README.tools
+		dobin contrib/encode.sh
+		newdoc contrib/cli-remote/README README.cli-remote
+		dobin contrib/cli-remote/jadeo-rcli
+		newdoc contrib/tsmm/README README.tsmm
+		dobin contrib/tsmm/xjtsmm
+		dobin contrib/tsmm/tsmm.pl
+		insinto "/usr/share/${PN}"
+		doins "contrib/${PN}-example.avi"
+	fi
 }