[proaudio] [964] updated and fixed xjadeo -- please test

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ] 

Revision: 964
Author:   evermind
Date:     2007-11-24 11:34:29 +0000 (Sat, 24 Nov 2007)

Log Message:
-----------
updated and fixed xjadeo -- please test

Modified Paths:
--------------
    trunk/overlays/proaudio/media-video/xjadeo/Manifest

Added Paths:
-----------
    trunk/overlays/proaudio/media-video/xjadeo/files/digest-xjadeo-0.4.1
    trunk/overlays/proaudio/media-video/xjadeo/files/xjadeo-0.4.1-use_sws_scale.patch
    trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.1.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-video/xjadeo/files/digest-xjadeo-0.4.0
    trunk/overlays/proaudio/media-video/xjadeo/files/digest-xjadeo-0.4.0_rc3
    trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.0.ebuild
    trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.0_rc3.ebuild



Modified: trunk/overlays/proaudio/media-video/xjadeo/Manifest
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/Manifest	2007-11-23 10:07:49 UTC (rev 963)
+++ trunk/overlays/proaudio/media-video/xjadeo/Manifest	2007-11-24 11:34:29 UTC (rev 964)
@@ -1,16 +1,12 @@
-DIST xjadeo-0.4.0.rc3.tar.gz 291702 RMD160 7bcc195e31067fd8b6e2f6ad7afa57776928584c SHA1 2bf04ec3c33036a58bbf63735616699bd5829193 SHA256 19e92f131e01826992c06cd8d8d01efe9f000c8eeee1b44e7c818fa829c2347c
-DIST xjadeo-0.4.0.tar.gz 291032 RMD160 dc76661d038326463a2daf9cebcbdabc79533308 SHA1 324679940933bb12ee18298c0aab1019a0e00840 SHA256 f990d123578072f716cd4023192b52526fc20a8bc58cc8f7fb4bae966870322d
-EBUILD xjadeo-0.4.0.ebuild 1388 RMD160 5c01ef318caf0381dede1bb5b01353fe7beaeef8 SHA1 50f30d5d6213ee0d2051da47d17bc27d07450ffc SHA256 a8ac650750587b12b2763cd29aecf6914fe351840724ad2f9956eb4dcee30e86
-MD5 93d3116535123d5a437aac9de1cc43e3 xjadeo-0.4.0.ebuild 1388
-RMD160 5c01ef318caf0381dede1bb5b01353fe7beaeef8 xjadeo-0.4.0.ebuild 1388
-SHA256 a8ac650750587b12b2763cd29aecf6914fe351840724ad2f9956eb4dcee30e86 xjadeo-0.4.0.ebuild 1388
-EBUILD xjadeo-0.4.0_rc3.ebuild 1388 RMD160 5c01ef318caf0381dede1bb5b01353fe7beaeef8 SHA1 50f30d5d6213ee0d2051da47d17bc27d07450ffc SHA256 a8ac650750587b12b2763cd29aecf6914fe351840724ad2f9956eb4dcee30e86
-MD5 93d3116535123d5a437aac9de1cc43e3 xjadeo-0.4.0_rc3.ebuild 1388
-RMD160 5c01ef318caf0381dede1bb5b01353fe7beaeef8 xjadeo-0.4.0_rc3.ebuild 1388
-SHA256 a8ac650750587b12b2763cd29aecf6914fe351840724ad2f9956eb4dcee30e86 xjadeo-0.4.0_rc3.ebuild 1388
-MD5 67e58d55dbff8828ded7222476b680ed files/digest-xjadeo-0.4.0 238
-RMD160 dc689e7f1f4ae0664c838508671dc9ba98c3437a files/digest-xjadeo-0.4.0 238
-SHA256 0f0afb122baf984216f5feb4a22a983926c1ab14d032d08dfaa2d5993e89268d files/digest-xjadeo-0.4.0 238
-MD5 58fbca6828e9b81b34a60685b079b22b files/digest-xjadeo-0.4.0_rc3 250
-RMD160 a5feebf73ba55217c67b475fa82b6a261eb857cd files/digest-xjadeo-0.4.0_rc3 250
-SHA256 c94dda9f09a9acf46f173fa9ba091589d607a5cfb32be2b9692d472e340b847f files/digest-xjadeo-0.4.0_rc3 250
+AUX xjadeo-0.4.1-use_sws_scale.patch 3230 RMD160 c0ae3b7ea5f5d453e74a7ca2dd02fbf56f5ebb70 SHA1 25b85c6255166e25412f0c38af30a822b1b92d8a SHA256 fd9c2067ee1e3e542c05a578fdc231061c1d3f092e12763f3b3ca0e4e1a01e90
+MD5 1dcaea49eca4d87be4e9fe1d449f3dfa files/xjadeo-0.4.1-use_sws_scale.patch 3230
+RMD160 c0ae3b7ea5f5d453e74a7ca2dd02fbf56f5ebb70 files/xjadeo-0.4.1-use_sws_scale.patch 3230
+SHA256 fd9c2067ee1e3e542c05a578fdc231061c1d3f092e12763f3b3ca0e4e1a01e90 files/xjadeo-0.4.1-use_sws_scale.patch 3230
+DIST xjadeo-0.4.1.tar.gz 303342 RMD160 ac60bee6df532516bdd64a841c3778b18dfb055f SHA1 18e3728e51ddc6bd408aeda931251b2ea91a3a9f SHA256 f78c2b9cd7ddad4c550ad4c4b0b178fe2cbdb9c09393baaf0ad19d814a4f5736
+EBUILD xjadeo-0.4.1.ebuild 1871 RMD160 74bfc7791e71f0904bf94ecb0d708a149db131a1 SHA1 6a6abdba105d7befe8d918f079f20a566a25257c SHA256 7419fc888d8e374918686e4ed022d0910d7549352e744e399998849365050422
+MD5 6a5d53a07064ce9ce83d50c4d0f0b0f8 xjadeo-0.4.1.ebuild 1871
+RMD160 74bfc7791e71f0904bf94ecb0d708a149db131a1 xjadeo-0.4.1.ebuild 1871
+SHA256 7419fc888d8e374918686e4ed022d0910d7549352e744e399998849365050422 xjadeo-0.4.1.ebuild 1871
+MD5 3768aa403f7b86fb28a2ab4191f52e01 files/digest-xjadeo-0.4.1 238
+RMD160 2eef33c8f86c7ae72d61a03e6c2afaa57e4f6543 files/digest-xjadeo-0.4.1 238
+SHA256 7ea42eebd73858dfb6e9eeafa3a5f67e94172c84bf0c4c9f8db01ad8ffcde786 files/digest-xjadeo-0.4.1 238

Deleted: trunk/overlays/proaudio/media-video/xjadeo/files/digest-xjadeo-0.4.0
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/files/digest-xjadeo-0.4.0	2007-11-23 10:07:49 UTC (rev 963)
+++ trunk/overlays/proaudio/media-video/xjadeo/files/digest-xjadeo-0.4.0	2007-11-24 11:34:29 UTC (rev 964)
@@ -1,3 +0,0 @@
-MD5 6185f52dd384c6ccace922ba493f3f5a xjadeo-0.4.0.tar.gz 291032
-RMD160 dc76661d038326463a2daf9cebcbdabc79533308 xjadeo-0.4.0.tar.gz 291032
-SHA256 f990d123578072f716cd4023192b52526fc20a8bc58cc8f7fb4bae966870322d xjadeo-0.4.0.tar.gz 291032

Deleted: trunk/overlays/proaudio/media-video/xjadeo/files/digest-xjadeo-0.4.0_rc3
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/files/digest-xjadeo-0.4.0_rc3	2007-11-23 10:07:49 UTC (rev 963)
+++ trunk/overlays/proaudio/media-video/xjadeo/files/digest-xjadeo-0.4.0_rc3	2007-11-24 11:34:29 UTC (rev 964)
@@ -1,3 +0,0 @@
-MD5 5f0a7847b8169bcf89c6d1446c83d1d8 xjadeo-0.4.0.rc3.tar.gz 291702
-RMD160 7bcc195e31067fd8b6e2f6ad7afa57776928584c xjadeo-0.4.0.rc3.tar.gz 291702
-SHA256 19e92f131e01826992c06cd8d8d01efe9f000c8eeee1b44e7c818fa829c2347c xjadeo-0.4.0.rc3.tar.gz 291702

Added: trunk/overlays/proaudio/media-video/xjadeo/files/digest-xjadeo-0.4.1
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/files/digest-xjadeo-0.4.1	                        (rev 0)
+++ trunk/overlays/proaudio/media-video/xjadeo/files/digest-xjadeo-0.4.1	2007-11-24 11:34:29 UTC (rev 964)
@@ -0,0 +1,3 @@
+MD5 a47819792dc067e1962ab33cc75aadd1 xjadeo-0.4.1.tar.gz 303342
+RMD160 ac60bee6df532516bdd64a841c3778b18dfb055f xjadeo-0.4.1.tar.gz 303342
+SHA256 f78c2b9cd7ddad4c550ad4c4b0b178fe2cbdb9c09393baaf0ad19d814a4f5736 xjadeo-0.4.1.tar.gz 303342

Added: 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	                        (rev 0)
+++ trunk/overlays/proaudio/media-video/xjadeo/files/xjadeo-0.4.1-use_sws_scale.patch	2007-11-24 11:34:29 UTC (rev 964)
@@ -0,0 +1,94 @@
+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);

Deleted: trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.0.ebuild	2007-11-23 10:07:49 UTC (rev 963)
+++ trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.0.ebuild	2007-11-24 11:34:29 UTC (rev 964)
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit versionator
-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/";
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="gpl"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE="xv sdl osd qt3 qt4 tools lash tiff"
-
-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
-	lash? ( >=media-sound/lash-0.4.0 )
-	sdl? ( >=media-libs/libsdl-1.2.8 )"
-
-DEPEND="${RDPEND}
-	>=sys-libs/zlib-1.2.2
-	qt3? ( >=x11-libs/qt-3 )
-	qt4? ( >=x11-libs/qt-4.1 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	if use qt4 ;then
-		export QTDIR=/usr
-		export QLIBS=/usr/lib/qt4
-		myconf="--enable-qtgui"
-	fi
-		
-		econf $(use_enable xv) \
-		$(use_enable sdl) \
-		$(use_enable osd ft) \
-		$(use_enable qt3 qtgui) \
-		$(use_enable tools contrib) \
-		$(use_enable lash) \
-		$(use_enable tiff) \
-		$myconf --disable-imlib --enable-imlib2 || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog TODO README NEWS
-	use tools && newdoc contrib/README README-tools
-	insinto /usr/share/${PN}
-	use tools && doins contrib/xjadeo-example.avi
-}

Deleted: trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.0_rc3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.0_rc3.ebuild	2007-11-23 10:07:49 UTC (rev 963)
+++ trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.0_rc3.ebuild	2007-11-24 11:34:29 UTC (rev 964)
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit versionator
-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/";
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="gpl"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE="xv sdl osd qt3 qt4 tools lash tiff"
-
-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
-	lash? ( >=media-sound/lash-0.4.0 )
-	sdl? ( >=media-libs/libsdl-1.2.8 )"
-
-DEPEND="${RDPEND}
-	>=sys-libs/zlib-1.2.2
-	qt3? ( >=x11-libs/qt-3 )
-	qt4? ( >=x11-libs/qt-4.1 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	if use qt4 ;then
-		export QTDIR=/usr
-		export QLIBS=/usr/lib/qt4
-		myconf="--enable-qtgui"
-	fi
-		
-		econf $(use_enable xv) \
-		$(use_enable sdl) \
-		$(use_enable osd ft) \
-		$(use_enable qt3 qtgui) \
-		$(use_enable tools contrib) \
-		$(use_enable lash) \
-		$(use_enable tiff) \
-		$myconf --disable-imlib --enable-imlib2 || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	einstall || die "einstall failed"
-	dodoc AUTHORS ChangeLog TODO README NEWS
-	use tools && newdoc contrib/README README-tools
-	insinto /usr/share/${PN}
-	use tools && doins contrib/xjadeo-example.avi
-}

Copied: trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.1.ebuild (from rev 963, trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.0.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.1.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-video/xjadeo/xjadeo-0.4.1.ebuild	2007-11-24 11:34:29 UTC (rev 964)
@@ -0,0 +1,73 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit versionator flag-o-matic autotools
+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/";
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="gpl"
+SLOT="0"
+KEYWORDS="x86 ~amd64"
+IUSE="xv sdl osd qt3 qt4 tools lash tiff"
+
+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
+	lash? ( >=media-sound/lash-0.4.0 )
+	sdl? ( >=media-libs/libsdl-1.2.8 )"
+
+DEPEND="${RDPEND}
+	>=sys-libs/zlib-1.2.2
+	qt3? ( >=x11-libs/qt-3 )
+	qt4? ( >=x11-libs/qt-4.1 )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	sws_support="$(strings /usr/lib/libavcodec.so|grep -c sws_scale)"
+	if [ "$sws_support" == "1" ];then
+		einfo "ffmpeg offers sws_scale support --> enabled"
+		append-flags -DHAVE_SWSCALE
+		export enable_sws_scale=true
+	else
+		einfo "ffmpeg: no sws_scale support trying old img_convert"
+	fi
+}
+
+src_unpack() {
+	unpack "${A}"
+	[ $enable_sws_scale ] && epatch "${FILESDIR}/xjadeo-0.4.1-use_sws_scale.patch"
+}
+
+src_compile() {
+	if use qt4 ;then
+		export QTDIR=/usr
+		export QLIBS=/usr/lib/qt4
+		myconf="--enable-qtgui"
+	fi
+
+	[ $enable_sws_scale ] && eautoreconf
+		
+		econf $(use_enable xv) \
+		$(use_enable sdl) \
+		$(use_enable osd ft) \
+		$(use_enable qt3 qtgui) \
+		$(use_enable tools contrib) \
+		$(use_enable lash) \
+		$(use_enable tiff) \
+		$myconf --disable-imlib --enable-imlib2 || die "econf failed"
+	emake || die
+}
+
+	
+src_install() {
+	einstall || die "einstall failed"
+	dodoc AUTHORS ChangeLog TODO README NEWS
+	use tools && newdoc contrib/README README-tools
+	insinto /usr/share/${PN}
+	use tools && doins contrib/xjadeo-example.avi
+}

Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/