video/xjadeo: removed (we no longer support qt3 (qt-x11))

6 files changed, 1 insertions, 106 deletions

diff --git a/ChangeLog b/ChangeLog
index 5d7d580dc8..24937b27ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -238,6 +238,7 @@
 	* video/dvbcut: removed (we no longer support qt3 (qt-x11))
 	* video/emotion: removed (we no longer support qt3 (qt-x11))
 	* video/gopedit: removed (we no longer support qt3 (qt-x11))
+	* video/xjadeo: removed (we no longer support qt3 (qt-x11))
 
 2011-10-05 Vlad Glagolev <stealth@sourcemage.org>
 	* python-pypi/fabric: new spell, simple, Pythonic tool for remote
diff --git a/video/xjadeo/DEPENDS b/video/xjadeo/DEPENDS
deleted file mode 100755
index 93c7c59b19..0000000000
--- a/video/xjadeo/DEPENDS
+++ /dev/null
@@ -1,10 +0,0 @@
-# auto* because of ffmpeg-svn/swscale patch
-depends autoconf &&
-depends automake &&
-depends JACK-DRIVER &&
-depends LIBAVCODEC &&
-# I'm lazy here, could be optional (but needs some X11 depends, then).
-depends qt-x11 &&
-optional_depends imlib2 --enable-imlib2 --disable-imlib2 "use imlib2 for display" &&
-optional_depends sdl --enable-sdl --disable-sdl "use sdl for display" &&
-optional_depends freetype2 --enable-ft --disable-ft "freetype On-Screen.Display support"
diff --git a/video/xjadeo/DETAILS b/video/xjadeo/DETAILS
deleted file mode 100755
index 0a3a18cb6a..0000000000
--- a/video/xjadeo/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-           SPELL=xjadeo
-         VERSION=0.4.1
-          SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-     SOURCE_HASH=sha512:9a184f6cea6dc8216e636ae3a99c0cc0d196e6e791e61eb828c7030bb900ba766089697457fbc164867fcd1cc0f118c5e643801e10f22fd6e97acb0e0e2c6e5b
-      LICENSE[0]=GPL
-        WEB_SITE=http://xjadeo.sourceforge.net
-         ENTERED=20071008
-           SHORT="simple video player that is synchronized to jack transport"
-cat <<EOF
-xjadeo is a program that displays a video clip in sync with
-an external time source, which comes quite handy when you
-want to create a soundtrack for a movie.
-EOF
diff --git a/video/xjadeo/HISTORY b/video/xjadeo/HISTORY
deleted file mode 100644
index e6a18f3e6a..0000000000
--- a/video/xjadeo/HISTORY
+++ /dev/null
@@ -1,9 +0,0 @@
-2008-03-04 Juuso Alasuutari <iuso@sourcemage.org>
-	* DEPENDS: Changed depends jack to JACK-DRIVER.
-
-2008-02-14 Thomas Orgis <sobukus@sourcemage.org>
-	* PRE_BUILD, xjadeo-swscale.patch: make it work with ffmpeg-svn
-	  (swscaler instead of img_convert)
-
-2007-10-09 Thomas Orgis <sobukus@sourcemage.org>
-	* DETAILS, DEPENDS: created spell
diff --git a/video/xjadeo/PRE_BUILD b/video/xjadeo/PRE_BUILD
deleted file mode 100755
index 2200b41a92..0000000000
--- a/video/xjadeo/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-message "${MESSAGE_COLOR}Patching to support ffmpeg-svn.$DEFAULT_COLOR" &&
-patch -Np1 < "$SCRIPT_DIRECTORY/xjadeo-swscale.patch" &&
-autoreconf -f -i
-
diff --git a/video/xjadeo/xjadeo-swscale.patch b/video/xjadeo/xjadeo-swscale.patch
deleted file mode 100644
index 603b1a0f3a..0000000000
--- a/video/xjadeo/xjadeo-swscale.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru xjadeo-0.4.1.orig/configure.ac xjadeo-0.4.1/configure.ac
---- xjadeo-0.4.1.orig/configure.ac	2007-06-16 18:53:10.000000000 +0200
-+++ xjadeo-0.4.1/configure.ac	2008-02-14 09:49:08.000000000 +0100
-@@ -289,6 +289,13 @@
- 	])
- fi
- 
-+dnl Newer FFMPEG (svn) does not support img_convert, use swscaler instead.
-+AC_CHECK_HEADER(ffmpeg/swscale.h, [HAVE_SWSCALE=yes])
-+if test "x$HAVE_SWSCALE" = "xyes"; then
-+	AC_DEFINE(HAVE_SWSCALE, 1, [Have ffmpeg swscaler.])
-+	FFMPEG_LIBS="$FFMPEG_LIBS -lswscale"
-+fi
-+
- AC_SUBST(FFMPEG_CFLAGS)
- AC_SUBST(FFMPEG_LIBS)
- 
-diff -ru xjadeo-0.4.1.orig/src/xjadeo/xjadeo.c xjadeo-0.4.1/src/xjadeo/xjadeo.c
---- xjadeo-0.4.1.orig/src/xjadeo/xjadeo.c	2007-06-16 18:57:11.000000000 +0200
-+++ xjadeo-0.4.1/src/xjadeo/xjadeo.c	2008-02-14 09:51:28.000000000 +0100
-@@ -35,6 +35,11 @@
- 
- #include <ffmpeg/avcodec.h>
- #include <ffmpeg/avformat.h>
-+#ifdef HAVE_SWSCALE
-+#include <ffmpeg/swscale.h>
-+static int sws_flags = SWS_FAST_BILINEAR;
-+struct SwsContext *scale_context = NULL;
-+#endif
- 
- #include <time.h>
- #include <getopt.h>
-@@ -657,9 +662,23 @@
- 			/* Did we get a video frame? */
- 			if(frameFinished) {
- 				/* Convert the image from its native format to FMT */
-+#ifdef HAVE_SWSCALE
-+			/* Inspired by rev 6649 of ffmpeg/trunk/vhook/watermark.c */
-+			scale_context = sws_getCachedContext(scale_context,
-+				pCodecCtx->width, pCodecCtx->height, pCodecCtx->pix_fmt,
-+				pCodecCtx->width, pCodecCtx->height, render_fmt,
-+				sws_flags, NULL, NULL, NULL);
-+			if(scale_context == NULL)
-+			{
-+				fprintf(stderr, "Failed to setup scaler! That's fatal for now (FIXME).\n");
-+				exit(100);
-+			}
-+			sws_scale(scale_context, 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 */
-@@ -710,6 +729,9 @@
- 
- 	//Close the video file
- 	av_close_input_file(pFormatCtx);
-+#ifdef HAVE_SWSCALE
-+	sws_freeContext(scale_context);
-+#endif
- 	return (0);
- }
-