Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (45d163cdb57496d216429eb8efa93d0f0319941a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (45d163cdb57496d216429eb8efa93d0f0319941a)
  • Date: Thu, 14 Feb 2008 03:00:51 -0600

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

ChangeLog | 3 +
video/xjadeo/DEPENDS | 10 +++++
video/xjadeo/DETAILS | 15 ++++++++
video/xjadeo/HISTORY | 6 +++
video/xjadeo/PRE_BUILD | 6 +++
video/xjadeo/xjadeo-swscale.patch | 66
++++++++++++++++++++++++++++++++++++++
6 files changed, 106 insertions(+)

New commits:
commit 45d163cdb57496d216429eb8efa93d0f0319941a
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

add xjadeo entry

commit 6cdecf700520ba3ddc507420c00ead89907dd155
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

xjadeo: add a patch to work with ffmpeg-svn

commit 3c065b5acb88c0efb4b2905d4f1c3c251b076f2c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

xjadeo: spell lzying around for some time, adding now

diff --git a/ChangeLog b/ChangeLog
index 2688713..38de6d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2008-02-14 Thomas Orgis <sobukus AT sourcemage.org>
+ * video/xjadeo: added JACK-synced video player
+
2008-02-11 Eric Sandall <sandalle AT sourcemage.org>
* libs/libvirt: Added C toolkit for virtualization
* python-pypi/urlgrabber: Added a Python library for simple file
fetching
diff --git a/video/xjadeo/DEPENDS b/video/xjadeo/DEPENDS
new file mode 100755
index 0000000..cd3e5f8
--- /dev/null
+++ b/video/xjadeo/DEPENDS
@@ -0,0 +1,10 @@
+# auto* because of ffmpeg-svn/swscale patch
+depends autoconf &&
+depends automake &&
+depends jack &&
+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
new file mode 100755
index 0000000..0a3a18c
--- /dev/null
+++ b/video/xjadeo/DETAILS
@@ -0,0 +1,15 @@
+ 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
new file mode 100644
index 0000000..8d1b533
--- /dev/null
+++ b/video/xjadeo/HISTORY
@@ -0,0 +1,6 @@
+2008-02-14 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, xjadeo-swscale.patch: make it work with ffmpeg-svn
+ (swscaler instead of img_convert)
+
+2007-10-09 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, DEPENDS: created spell
diff --git a/video/xjadeo/PRE_BUILD b/video/xjadeo/PRE_BUILD
new file mode 100755
index 0000000..2200b41
--- /dev/null
+++ b/video/xjadeo/PRE_BUILD
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000..603b1a0
--- /dev/null
+++ b/video/xjadeo/xjadeo-swscale.patch
@@ -0,0 +1,66 @@
+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);
+ }
+



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (45d163cdb57496d216429eb8efa93d0f0319941a), Thomas Orgis, 02/14/2008

Archive powered by MHonArc 2.6.24.

Top of Page