diff options
| -rw-r--r-- | media-video/jubler/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/jubler/Manifest | 15 | ||||
| -rw-r--r-- | media-video/jubler/files/jubler-3.9.6-ffmpegfix.patch | 155 | ||||
| -rw-r--r-- | media-video/jubler/files/jubler-3.9.6.patch | 180 | ||||
| -rw-r--r-- | media-video/jubler/files/jubler-4.0.patch | 233 | ||||
| -rw-r--r-- | media-video/jubler/jubler-4.0.ebuild | 76 | ||||
| -rw-r--r-- | media-video/jubler/jubler-4.1.1.ebuild | 77 | ||||
| -rw-r--r-- | media-video/videotrans/Manifest | 14 |
8 files changed, 22 insertions, 735 deletions
diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog index e695ecdcd0b6..f624cec3295b 100644 --- a/media-video/jubler/ChangeLog +++ b/media-video/jubler/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/jubler # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.41 2011/05/15 15:36:12 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.42 2011/05/15 15:38:42 scarabeus Exp $ + + 15 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> + -files/jubler-3.9.6-ffmpegfix.patch, -files/jubler-3.9.6.patch, + -jubler-4.0.ebuild, -files/jubler-4.0.patch, -jubler-4.1.1.ebuild: + Punt overshadowed version so virtual/ffmpeg depending one is only around. 15 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> jubler-4.6.1-r3.ebuild: Depend on virtual/ffmpeg. Per bug #362159. diff --git a/media-video/jubler/Manifest b/media-video/jubler/Manifest index bfcd5985d332..fc826a076777 100644 --- a/media-video/jubler/Manifest +++ b/media-video/jubler/Manifest @@ -1,23 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX jubler-3.9.6-ffmpegfix.patch 6490 RMD160 7d74f58669d432a7ce70712133a7b5b56628dcef SHA1 5621c535b2db6b2ebe84e1cfa04983d422ba710a SHA256 6b7fd1c8d629a8b4ec145eb5d0af6efa23d4c4f7c511c0ed8b1073d3fd6be9e7 -AUX jubler-3.9.6.patch 6234 RMD160 0fa28e9630b9214baa86f0e1de568e1430a30a51 SHA1 78885cef527b52ea759f36e9c5381c123add9330 SHA256 2c9eceec9bda75cba57df9c721eb93a6253f4cd59ea09deb2cb74012d252735e -AUX jubler-4.0.patch 8113 RMD160 4b4b631625974295126670027a88d0b953b35abf SHA1 0f752b01fc48a015df7d1d815b02c274bbe6a7d1 SHA256 d11d290dc2b026ac2756e00156918eab20096aaa2b8f24313ed5fd5c5882dfc2 AUX jubler-4.6.1-gentoo.patch 7061 RMD160 eff23b313238cea0dea70a650e68f8cbb1548cbe SHA1 9c5bd046589415e25895b9302ecae6b88d355adb SHA256 bdbd3cd908b57e2838c30e590e5296933615bf88369a1ebea19a77bd6fd017ed AUX update-4.6.1.xml 20433 RMD160 67ac71b73efeaf2a0eb557b716b758ef316291b8 SHA1 c527f29c140f704212a03cd1e9281f84f4da6c2e SHA256 c133425099109638160243bf299f395cda13fe9e98ee3a6a1322e576f340d78b DIST Jubler-source-4.6.1.tar.bz2 1971701 RMD160 40553e1ffd333bbb6ff143a54080e3f5196f5ec2 SHA1 89fb4d0f053fa12837cfc151fa020f85ed52708c SHA256 1aeed14cc500165470b29884585432e9d14940c314bafa0f6318789005dd18f1 -DIST Jubler-src-4.0.tar.bz2 1760172 RMD160 48ac22a534d1f3aa9505d54a2a25e2497471bd5e SHA1 566464fd8282e124d34f28ccf2df03a5c45da2d9 SHA256 988317fdd958112dddc8729dd4093df7da91571e6a587e4492b3049748412501 -DIST Jubler-src-4.1.1.tar.bz2 1760728 RMD160 5254dcdc7d4ed160e907547d7899d898af2e3084 SHA1 2c6e3ce228431501fa9a8f82b074633843739b47 SHA256 cfaec92f344da4b35f312a88328aff88b968b2d09213149a9a7e696c9789f7ca -EBUILD jubler-4.0.ebuild 2247 RMD160 16099620215ec43a577d1e848590e9a59ed8fe3d SHA1 afb0519765c0c28c81495ab017ae801113ac799c SHA256 b8e2c4db45150ad1cfccb09c786b5803666f6cbacc682dbaa8a558eb9f319d93 -EBUILD jubler-4.1.1.ebuild 2281 RMD160 5673f3d558c2c56ea04da7ec9a0fbb85cddbcd7a SHA1 2dac5b62dd67b6d28c8d257bd4eee1616ef55914 SHA256 84d861668dee12f12f6b2ea9e1883789042d952a2b33ff3162b072ad3066410e EBUILD jubler-4.6.1-r3.ebuild 2907 RMD160 01c181892b554c42a4673d0198c486d276965da9 SHA1 9bad139c47976a172b7de384d431a9cf6dbb4c32 SHA256 541a1753de7180c5d4069449c20697ef4893c884765d2b225f01f706f3075d2f -MISC ChangeLog 6639 RMD160 a82cc7e65c516d8250011b3a922000d773963e9a SHA1 5409dbcba010b33812e20648e65ace76d8079126 SHA256 d5df5acbbabdf8c652a651bd719377ea15c57c5de634bd2c0f1a0d0ce4eef616 +MISC ChangeLog 6906 RMD160 5419ada6e7d215308a2801f03f5c5827cea50e2e SHA1 0d9eac3905ea83bf02ae88d53b70464c34e738b7 SHA256 3013a69426133ecc9aad3bea79a6bcde43edb80624d1f70ae73fce32488f8a8c MISC metadata.xml 216 RMD160 05d4d9c2f1c459ea9309346016001e26bad574ce SHA1 98783559fec44d27f1294db2e9549af2fe38f1b3 SHA256 94b55a2ec67c524728d32249d59a6a1545fd37d61c83259b5f05163ca47e87e1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk3P8vIACgkQHB6c3gNBRYdsMwCeMonAcz9h9S+DKrFolJRlpA+R -XiQAn1yJ0+srg44N6GATAC8IgCbQBpr6 -=OJMc +iEYEARECAAYFAk3P84cACgkQHB6c3gNBRYfLMwCgjsBWnbAigIlC3yMr5BXUw0Bo +vggAoL2f/ZIeDzQ4ETzhdh/97od/ZxLT +=2z6T -----END PGP SIGNATURE----- diff --git a/media-video/jubler/files/jubler-3.9.6-ffmpegfix.patch b/media-video/jubler/files/jubler-3.9.6-ffmpegfix.patch deleted file mode 100644 index c712cf97dcfc..000000000000 --- a/media-video/jubler/files/jubler-3.9.6-ffmpegfix.patch +++ /dev/null @@ -1,155 +0,0 @@ ---- Jubler-3.9.6/resources/ffdecode/decodeframe.c 2008-08-10 20:15:55.000000000 +0300 -+++ jubler/resources/ffdecode/decodeframe.c 2008-10-29 06:46:11.000000000 +0200 -@@ -39,19 +39,23 @@ - #include "defaults.h" - #include "utilities.h" - -+#define MAXSIZE 16383 -+ -+ - AVPicture *decodeFrame(JNIEnv * env, jobject this, const char *input_filename, jlong timepos, jint *width, jint *height, jfloat resize); - int file_info(JNIEnv * env, jobject this, char *input_filename); -+void storenumb (jbyte * data, int number); - - static int sws_flags = SWS_BICUBIC; - - --JNIEXPORT jintArray JNICALL Java_com_panayotis_jubler_media_preview_decoders_FFMPEG_grabFrame(JNIEnv * env, jobject this, jstring video, jlong time, jfloat resize) { -+JNIEXPORT jbyteArray JNICALL Java_com_panayotis_jubler_media_preview_decoders_FFMPEG_grabFrame(JNIEnv * env, jobject this, jstring video, jlong time, jfloat resize) { - /* Pointers for c-like strings */ - const char *video_c; - - /* Here we'll store the frame for java */ -- jintArray matrix = NULL; -- jint* matrixdata = NULL; -+ jbyteArray matrix = NULL; -+ jbyte* matrixdata = NULL; - - /* Frame raw data */ - AVPicture* pict; -@@ -65,18 +69,20 @@ - if (pict) { - - // make array -- matrix = (*env)->NewIntArray(env, width*height+2); // 4 bytes per pixel (int) plus picture information -+ matrix = (*env)->NewByteArray(env, width*height*3+4); // 3 bytes per pixel + picture width information (2*2) - - if (matrix) { - /* Find pointer for matrix size */ -- matrixdata = (*env)->GetIntArrayElements(env, matrix, 0); -+ matrixdata = (*env)->GetByteArrayElements(env, matrix, 0); - -- /* This is a trick: the first 2 elements are not video data but the size of the video */ -- matrixdata[0] = width; -- matrixdata[1] = height; -- memcpy(matrixdata+2, pict->data[0], 4*width*height); -+ /* This is a trick: the first 4 bytes are not video data but the size of the video */ -+ storenumb(matrixdata, width); -+ storenumb(matrixdata+2, height); -+ -+ /* Copy the actual color map to picture buffer */ -+ memcpy(matrixdata+4, pict->data[0], 3*width*height); - /* Release the matrix data pointer */ -- (*env)->ReleaseIntArrayElements(env, matrix, matrixdata, 0); -+ (*env)->ReleaseByteArrayElements(env, matrix, matrixdata, 0); - } else { - DEBUG(env, this, "grabFrame", "Can not create array into memory."); - } -@@ -206,14 +212,24 @@ - av_free_packet(&pkt); - } - if (retflag != FALSE) { -- *width = (ccx->width) * resize; -- *height = (ccx->height) * resize; -+ /* Calculating new picture size and keep aspect ratio */ -+ *width = (ccx->width) * resize; -+ *height = (ccx->height) * resize; -+ if (*width > MAXSIZE ) { -+ *height = ( (*height) * MAXSIZE) / (*width); -+ *width = MAXSIZE; -+ } -+ if (*height > MAXSIZE) { -+ *width = ( (*width) * MAXSIZE) / (*height); -+ *height = MAXSIZE; -+ } -+ - DEBUG(env, this, "decodeFrame", "Resampling from (%i,%i) with resize factor %f to (%i,%i)",ccx->width, ccx->height, resize,*width, *height); - // Allocate an AVPicture -- avpicture_alloc(pict, PIX_FMT_RGBA32, *width, *height); -+ avpicture_alloc(pict, PIX_FMT_RGB24, *width, *height); - swsContext = sws_getCachedContext(swsContext, - ccx->width, ccx->height, ccx->pix_fmt, -- *width, *height, PIX_FMT_RGBA32, -+ *width, *height, PIX_FMT_RGB24, - sws_flags, NULL, NULL, NULL); - if (swsContext == NULL) { - DEBUG(env, this, "decodeFrame", "swscale context initialization failed."); -@@ -264,5 +280,8 @@ - return 0; - } - -- -+void storenumb (jbyte * data, int number) { -+ data[0] = number/128; -+ data[1] = number % 128; -+} - ---- Jubler-3.9.6/src/com/panayotis/jubler/media/preview/decoders/FFMPEG.java 2008-09-08 18:22:10.000000000 +0300 -+++ jubler/src/com/panayotis/jubler/media/preview/decoders/FFMPEG.java 2008-10-29 06:46:03.000000000 +0200 -@@ -56,23 +56,8 @@ - public final class FFMPEG extends NativeDecoder { - private static boolean library_is_present = false; - -- private static final int[] bitmasks; -- private static final ColorModel cmodel; -- -- - static { - library_is_present = SystemFileFinder.loadLibrary("ffdecode"); -- -- int[] LE_BITMASKS = {0xff0000, 0xff00, 0xff, 0xff000000}; -- int[] BE_BITMASKS = {0xff00, 0xff0000, 0xff000000, 0xff}; -- -- if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) { -- bitmasks = LE_BITMASKS; -- cmodel = ColorModel.getRGBdefault(); -- } else { -- bitmasks = BE_BITMASKS; -- cmodel = new DirectColorModel(32, bitmasks[0], bitmasks[1], bitmasks[2], bitmasks[3]); -- } - } - - /** Creates a new instance of FFMPEG */ -@@ -82,13 +67,16 @@ - if ( vfile==null || (!isDecoderValid()) ) return null; - - time *= 1000000; -- int[] frame = grabFrame(vfile.getPath(), (long)time, resize); -- if (frame==null) return null; -- -- SinglePixelPackedSampleModel model = new SinglePixelPackedSampleModel(DataBuffer.TYPE_INT,frame[0], frame[1], bitmasks); -- DataBufferInt buffer = new DataBufferInt(frame, frame[0]*frame[1], 2); -- WritableRaster ras = Raster.createWritableRaster(model, buffer, null); -- BufferedImage image = new BufferedImage(cmodel, ras, true, null); -+ byte[] data = grabFrame(vfile.getPath(), (long)time, resize); -+ if (data==null) return null; -+ -+ byte[] frame = new byte[data.length-4]; -+ int X = data[0] * 128 + data[1]; -+ int Y = data[2] * 128 + data[3]; -+ System.arraycopy(data, 4, frame, 0, frame.length); -+ BufferedImage image = new BufferedImage(X, Y, BufferedImage.TYPE_3BYTE_BGR); -+ WritableRaster raster = image.getRaster(); -+ raster.setDataElements(0, 0, X, Y, frame); - return image; - } - -@@ -152,7 +140,7 @@ - } - - /* Get the image for this timestamp */ -- private native int[] grabFrame(String video, long time, float resize); -+ private native byte[] grabFrame(String video, long time, float resize); - - /* Create a wav file from the specified time stamps */ - private native boolean createClip(String audio, String wav, long from, long to); diff --git a/media-video/jubler/files/jubler-3.9.6.patch b/media-video/jubler/files/jubler-3.9.6.patch deleted file mode 100644 index 32cbeb3b601f..000000000000 --- a/media-video/jubler/files/jubler-3.9.6.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -Nur Jubler-3.9.6/build.xml Jubler-3.9.6_patched/build.xml ---- Jubler-3.9.6/build.xml 2008-09-07 02:05:23.000000000 +0300 -+++ Jubler-3.9.6_patched/build.xml 2008-09-22 19:40:36.000000000 +0300 -@@ -69,22 +69,6 @@ - - - -- <!-- Define new ant tasks --> -- -- <taskdef name="izpack" -- onerror="report" -- classpath="../../Tools/IzPack/standalone-compiler.jar" -- classname="com.izforge.izpack.ant.IzPackTask"/> -- -- <taskdef name="launch4j" -- onerror="report" -- classpath="../../Tools/launch4j/launch4j.jar:../TOOLS/launch4j/lib/xstream.jar" -- classname="net.sf.launch4j.ant.Launch4jTask"/> -- -- <taskdef name="jarbundler" -- onerror="report" -- classpath="../../Tools/jarbundler/jarbundler-1.9.jar" -- classname="net.sourceforge.jarbundler.JarBundler" /> - - - -@@ -397,9 +381,6 @@ - - - -- <target name="-pre-compile"> -- <copy todir="src/com"> <fileset dir="resources/system/no_mac"/> </copy> -- </target> - <target name="-post-compile"> - <delete dir="build/classes/com/apple" failonerror="false"/> - <delete dir="src/com/apple" failonerror="false"/> -diff -Nur Jubler-3.9.6/resources/ffdecode/Makefile Jubler-3.9.6_patched/resources/ffdecode/Makefile ---- Jubler-3.9.6/resources/ffdecode/Makefile 2008-09-22 11:01:58.000000000 +0300 -+++ Jubler-3.9.6_patched/resources/ffdecode/Makefile 2008-09-22 19:41:30.000000000 +0300 -@@ -12,9 +12,6 @@ - # Name of the produced library - PROJ=ffdecode - --# Paths of include files --JAVA_HOME=${shell /bin/sh ../system/findjava.sh -j} -- - # Current Path - CPATH=${shell pwd} - -@@ -106,7 +103,6 @@ - CCPREF_NOS=${shell echo ${CCPREF} | sed -e 's/-$$//g' } - DCONFIG=--with-mp4v2 --host=${CCPREF_NOS} - --CC=${CCPREF}gcc - RANLIB=${CCPREF}ranlib - - ifeq (${NOSTRIP},) -@@ -121,7 +117,7 @@ - .SUFFIXES:.o .c - - .c.o: -- ${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -O3 -Wall ${INCS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${SYSTEM} -c -o $@ $? -+ ${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -Wall ${INCS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${SYSTEM} -c -o $@ $? - - - develop:javacheck -diff -Nur Jubler-3.9.6/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-3.9.6_patched/src/com/panayotis/jubler/information/HelpBrowser.java ---- Jubler-3.9.6/src/com/panayotis/jubler/information/HelpBrowser.java 2008-09-08 18:22:32.000000000 +0300 -+++ Jubler-3.9.6_patched/src/com/panayotis/jubler/information/HelpBrowser.java 2008-09-22 19:42:04.000000000 +0300 -@@ -47,7 +47,7 @@ - - history = new ArrayList<String>(); - -- String initpage = "file:"+SystemFileFinder.getJublerAppPath()+"/help/jubler-faq.html"; -+ String initpage = "file:"+SystemFileFinder.getJublerAppPath()+"/../help/jubler-faq.html"; - setPage(initpage); - history.add(initpage); - -diff -Nur Jubler-3.9.6/src/com/panayotis/jubler/Main.java Jubler-3.9.6_patched/src/com/panayotis/jubler/Main.java ---- Jubler-3.9.6/src/com/panayotis/jubler/Main.java 2008-09-16 12:51:40.000000000 +0300 -+++ Jubler-3.9.6_patched/src/com/panayotis/jubler/Main.java 2008-09-22 19:42:48.000000000 +0300 -@@ -105,17 +105,9 @@ - /* Load arguments, in a mac way */ - SystemDependent.initApplication(); - -- /* Check current version in a new thread */ -- Thread versioncheck = new Thread() { -- public void run() { -- StaticJubler.initVersion(); -- } -- }; -- - new Jubler(); // Display initial Jubler window - splash.dispose(); // Hide splash screen - loader.start(); // initialize loader -- versioncheck.start(); - } - - static private MainSplash splash; -diff -Nur Jubler-3.9.6/src/com/panayotis/jubler/os/SystemDependent.java Jubler-3.9.6_patched/src/com/panayotis/jubler/os/SystemDependent.java ---- Jubler-3.9.6/src/com/panayotis/jubler/os/SystemDependent.java 2008-09-20 23:59:27.000000000 +0300 -+++ Jubler-3.9.6_patched/src/com/panayotis/jubler/os/SystemDependent.java 2008-09-22 19:43:40.000000000 +0300 -@@ -25,10 +25,6 @@ - - import static com.panayotis.jubler.i18n.I18N._; - --import com.apple.eawt.Application; --import com.apple.eawt.ApplicationAdapter; --import com.apple.eawt.ApplicationEvent; -- - import com.panayotis.jubler.Jubler; - import com.panayotis.jubler.Main; - import com.panayotis.jubler.StaticJubler; -@@ -113,10 +109,6 @@ - - - public static void initApplication() { -- /* In Linux this is a dummy function */ -- if (isMacOSX()) { -- JublerApp japp = new JublerApp(); -- } - } - - -@@ -342,35 +334,3 @@ - } - } - -- -- --class JublerApp extends Application { -- public JublerApp() { -- setEnabledPreferencesMenu(true); -- addApplicationListener(new ApplicationHandler()); -- } --} -- --class ApplicationHandler extends ApplicationAdapter { -- -- public ApplicationHandler() {} -- -- public void handleAbout(ApplicationEvent event) { -- StaticJubler.showAbout(); -- event.setHandled(true); -- } -- -- public void handlePreferences(ApplicationEvent event) { -- Jubler.prefs.showPreferencesDialog(); -- event.setHandled(true); -- } -- -- public void handleQuit(ApplicationEvent event) { -- StaticJubler.prepareQuitAll(); -- event.setHandled(false); -- } -- -- public void handleOpenFile(ApplicationEvent event) { -- Main.asyncAddSubtitle(event.getFilename()); -- } --} -diff -Nur Jubler-3.9.6/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-3.9.6_patched/src/com/panayotis/jubler/os/SystemFileFinder.java ---- Jubler-3.9.6/src/com/panayotis/jubler/os/SystemFileFinder.java 2008-09-08 18:22:32.000000000 +0300 -+++ Jubler-3.9.6_patched/src/com/panayotis/jubler/os/SystemFileFinder.java 2008-09-22 19:44:30.000000000 +0300 -@@ -58,15 +58,12 @@ - } - - public static boolean loadLibrary(String name) { -- File libfile = findFile("lib"+pathseparator+System.mapLibraryName(name)); -- if (libfile!=null) { - try { -- System.load(libfile.getAbsolutePath()); -+ System.loadLibrary(name); - return true; - } catch (UnsatisfiedLinkError e) { - e.printStackTrace(); - } -- } - return false; - } - diff --git a/media-video/jubler/files/jubler-4.0.patch b/media-video/jubler/files/jubler-4.0.patch deleted file mode 100644 index cd71f057d0a4..000000000000 --- a/media-video/jubler/files/jubler-4.0.patch +++ /dev/null @@ -1,233 +0,0 @@ -diff -Nur Jubler-4.0/build.xml Jubler-4.0_patched/build.xml ---- Jubler-4.0/build.xml 2008-12-11 12:33:50.000000000 +0200 -+++ Jubler-4.0_patched/build.xml 2008-12-20 03:14:59.000000000 +0200 -@@ -69,25 +69,6 @@ - - - -- <!-- Define new ant tasks --> -- -- <taskdef name="izpack" -- onerror="report" -- classpath="../../../Tools/IzPack/standalone-compiler.jar" -- classname="com.izforge.izpack.ant.IzPackTask"/> -- -- <taskdef name="launch4j" -- onerror="report" -- classpath="../../../Tools/launch4j/launch4j.jar:../TOOLS/launch4j/lib/xstream.jar" -- classname="net.sf.launch4j.ant.Launch4jTask"/> -- -- <taskdef name="jarbundler" -- onerror="report" -- classpath="../../../Tools/jarbundler/jarbundler-1.9.jar" -- classname="net.sourceforge.jarbundler.JarBundler" /> -- -- -- - <target name="i18n"> - <exec dir="resources/i18n" executable="bash" failonerror="true"> - <arg line="compile"/> -@@ -430,9 +411,6 @@ - - - -- <target name="-pre-compile"> -- <copy todir="src/com"> <fileset dir="resources/system/no_mac"/> </copy> -- </target> - <target name="-post-compile"> - <delete dir="build/classes/com/apple" failonerror="false"/> - <delete dir="src/com/apple" failonerror="false"/> -diff -Nur Jubler-4.0/resources/ffdecode/Makefile Jubler-4.0_patched/resources/ffdecode/Makefile ---- Jubler-4.0/resources/ffdecode/Makefile 2008-12-08 11:16:13.000000000 +0200 -+++ Jubler-4.0_patched/resources/ffdecode/Makefile 2008-12-20 04:50:48.000000000 +0200 -@@ -12,9 +12,6 @@ - # Name of the produced library - PROJ=ffdecode - --# Paths of include files --JAVA_HOME=${shell /bin/sh ../system/findjava.sh -j} -- - # Current Path - CPATH=${shell pwd} - -@@ -39,7 +36,6 @@ - # Various options - FFCONF=configure - LIBSUF=_${SYSTEM}.${ARCH} --MAKEOPTS=-j3 - - # Find requested files - NATIVES=${shell cd ../../src && grep -r ' native ' * | grep -v '/.svn/' | gawk -F ':' '{print $$1}' | uniq | sed -e 's/\.java$$//g' | tr '/' '.' } -@@ -106,7 +102,6 @@ - CCPREF_NOS=${shell echo ${CCPREF} | sed -e 's/-$$//g' } - DCONFIG=--with-mp4v2 --host=${CCPREF_NOS} - --CC=${CCPREF}gcc - RANLIB=${CCPREF}ranlib - - ifeq (${NOSTRIP},) -@@ -121,35 +116,35 @@ - .SUFFIXES:.o .c - - .c.o: -- ${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -O3 -Wall ${INCS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${SYSTEM} -c -o $@ $? -+ ${CC} ${CFLAGS} ${GCCOPTS} -std=c99 -pedantic -Wall ${INCS} -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${SYSTEM} -c -o $@ $? - - - develop:javacheck -- make -e `uname -s|tr [A-Z] [a-z]` -+ $(MAKE) -e `uname -s|tr [A-Z] [a-z]` - - - linux:javacheck distclean -- make -e library MAKESYS=linux -+ $(MAKE) -e library MAKESYS=linux - rm -rf ${JUBLER}/src/lib - - linuxdyn:javacheck distclean -- make -e library MAKESYS=linux STATIC=no -+ $(MAKE) -e library MAKESYS=linux STATIC=no - rm -rf ${Jubler}/src/lib - - win32:javacheck distclean -- make -e library MAKESYS=win32 -+ $(MAKE) -e library MAKESYS=win32 - rm -rf ${JUBLER}/src/lib - - darwin:javacheck -- make distclean -- make -e LIB MAKESYS=darwin_ppc -- make distclean -- make -e LIB MAKESYS=darwin_i386 -- make distclean -+ $(MAKE) distclean -+ $(MAKE) -e LIB MAKESYS=darwin_ppc -+ $(MAKE) distclean -+ $(MAKE) -e LIB MAKESYS=darwin_i386 -+ $(MAKE) distclean - lipo ${PROJ}.ppc ${PROJ}.i386 -create -output ${MACLIBNAME} - TIGER=`otool -vR ${MACLIBNAME} | grep UNIX` ; if [ -n "$$TIGER" ] ; then echo "Tiger compatibility problem!" ; echo $$TIGER ; exit 1 ; fi - rm -f ${PROJ}.ppc ${PROJ}.i386 -- make -e libinstall LIBNAME=${MACLIBNAME} -+ $(MAKE) -e libinstall LIBNAME=${MACLIBNAME} - - library:clean ${LIBNAME} libinstall - -@@ -190,19 +185,19 @@ - - - ${LIBRARIES}/libfaad${LIBSUF}.a: -- cd ${FAAD} && CFLAGS="${GCCOPTS}" LDFLAGS="${GCCOPTS}" ./configure ${DCONFIG} && mv frontend/Makefile frontend/Makefile.orig && echo >frontend/Makefile "all:" && make -j3 -+ cd ${FAAD} && CFLAGS="${GCCOPTS}" LDFLAGS="${GCCOPTS}" ./configure ${DCONFIG} && mv frontend/Makefile frontend/Makefile.orig && echo >frontend/Makefile "all:" && $(MAKE) -j3 - mkdir -p ${LIBRARIES} - cp ${FAAD}/libfaad/.libs/libfaad.a ${LIBRARIES}/libfaad${LIBSUF}.a -- cd ${FAAD} && mv frontend/Makefile.orig frontend/Makefile && make distclean -+ cd ${FAAD} && mv frontend/Makefile.orig frontend/Makefile && $(MAKE) distclean - - ${LIBRARYREQ}: ${LIBRARIES}/libfaad${LIBSUF}.a - mkdir -p ${LIBRARIES} - cd ${LIBRARIES} ; rm -f libfaad.a && ln -s libfaad${LIBSUF}.a libfaad.a -- cd ${FFMPEG} && ./${FFCONF} ${FCONFIG} && make -j3 -+ cd ${FFMPEG} && ./${FFCONF} ${FCONFIG} && $(MAKE) -j3 - cp ${FFMPEG}/libavformat/libavformat.a ${LIBRARIES}/libavformat${LIBSUF}.a - cp ${FFMPEG}/libavcodec/libavcodec.a ${LIBRARIES}/libavcodec${LIBSUF}.a - cp ${FFMPEG}/libavutil/libavutil.a ${LIBRARIES}/libavutil${LIBSUF}.a -- cd ${FFMPEG} && make distclean -+ cd ${FFMPEG} && $(MAKE) distclean - rm -f ${LIBRARIES}/libfaad.a - - -diff -Nur Jubler-4.0/src/com/panayotis/jubler/information/HelpBrowser.java Jubler-4.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java ---- Jubler-4.0/src/com/panayotis/jubler/information/HelpBrowser.java 2008-11-29 17:13:57.000000000 +0200 -+++ Jubler-4.0_patched/src/com/panayotis/jubler/information/HelpBrowser.java 2008-12-20 02:49:14.000000000 +0200 -@@ -47,7 +47,7 @@ - - history = new ArrayList<String>(); - -- String initpage = "file:"+SystemFileFinder.getJublerAppPath()+"/help/jubler-faq.html"; -+ String initpage = "file:"+SystemFileFinder.getJublerAppPath()+"/../help/jubler-faq.html"; - setPage(initpage); - history.add(initpage); - -diff -Nur Jubler-4.0/src/com/panayotis/jubler/os/SystemDependent.java Jubler-4.0_patched/src/com/panayotis/jubler/os/SystemDependent.java ---- Jubler-4.0/src/com/panayotis/jubler/os/SystemDependent.java 2008-11-29 17:13:57.000000000 +0200 -+++ Jubler-4.0_patched/src/com/panayotis/jubler/os/SystemDependent.java 2008-12-20 02:50:17.000000000 +0200 -@@ -25,10 +25,6 @@ - - import static com.panayotis.jubler.i18n.I18N._; - --import com.apple.eawt.Application; --import com.apple.eawt.ApplicationAdapter; --import com.apple.eawt.ApplicationEvent; -- - import com.panayotis.jubler.Jubler; - import com.panayotis.jubler.Main; - import com.panayotis.jubler.StaticJubler; -@@ -108,10 +104,6 @@ - - - public static void initApplication() { -- /* In Linux this is a dummy function */ -- if (IS_MACOSX) { -- JublerApp japp = new JublerApp(); -- } - } - - -@@ -338,36 +330,3 @@ - } - } - -- -- --class JublerApp extends Application { -- public JublerApp() { -- setEnabledPreferencesMenu(true); -- addApplicationListener(new ApplicationHandler()); -- } --} -- --class ApplicationHandler extends ApplicationAdapter { -- -- public ApplicationHandler() {} -- -- public void handleAbout(ApplicationEvent event) { -- StaticJubler.showAbout(); -- event.setHandled(true); -- } -- -- public void handlePreferences(ApplicationEvent event) { -- Jubler.prefs.showPreferencesDialog(); -- event.setHandled(true); -- } -- -- public void handleQuit(ApplicationEvent event) { -- if (StaticJubler.requestQuit(null)) -- System.exit(0); -- event.setHandled(false); -- } -- -- public void handleOpenFile(ApplicationEvent event) { -- Main.asyncAddSubtitle(event.getFilename()); -- } --} -diff -Nur Jubler-4.0/src/com/panayotis/jubler/os/SystemFileFinder.java Jubler-4.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java ---- Jubler-4.0/src/com/panayotis/jubler/os/SystemFileFinder.java 2008-11-29 17:13:57.000000000 +0200 -+++ Jubler-4.0_patched/src/com/panayotis/jubler/os/SystemFileFinder.java 2008-12-20 02:51:03.000000000 +0200 -@@ -56,15 +56,12 @@ - } - - public static boolean loadLibrary(String name) { -- File libfile = findFile("lib"+pathseparator+System.mapLibraryName(name)); -- if (libfile!=null) { - try { -- System.load(libfile.getAbsolutePath()); -+ System.loadLibrary(name); - return true; - } catch (UnsatisfiedLinkError e) { - e.printStackTrace(); - } -- } - return false; - } - diff --git a/media-video/jubler/jubler-4.0.ebuild b/media-video/jubler/jubler-4.0.ebuild deleted file mode 100644 index 75fb574cfa0e..000000000000 --- a/media-video/jubler/jubler-4.0.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.0.ebuild,v 1.3 2009/04/04 15:20:19 maekke Exp $ - -EAPI="2" -inherit gnome2 eutils java-pkg-2 java-ant-2 toolchain-funcs - -MY_PN=${PN/#j/J} -DESCRIPTION="Java subtitle editor" -HOMEPAGE="http://www.jubler.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="mplayer nls spell" - -RDEPEND=">=virtual/jre-1.5 - >=media-video/ffmpeg-0.4.9_p20080326 - mplayer? ( media-video/mplayer[ass] ) - spell? - ( - app-text/aspell - >=dev-java/zemberek-2.0[linguas_tr] - ) - dev-java/jupidator" - -DEPEND=">=virtual/jdk-1.5 - media-video/ffmpeg - app-text/docbook-sgml-utils - dev-util/pkgconfig - nls? ( sys-devel/gettext ) - dev-java/jupidator" - -S=${WORKDIR}/${MY_PN}-${PV} - -src_unpack() { - unpack ${A} - cd "${S}" || die - epatch "${FILESDIR}/${P}.patch" - chmod +x resources/installers/linux/iconinstall - JAVA_ANT_CLASSPATH_TAGS="java javac" java-ant_rewrite-classpath - java-ant_rewrite-classpath nbproject/build-impl.xml -} - -src_compile() { - java-pkg_filter-compiler ecj-3.2 - eant -Dgentoo.classpath="$(java-pkg_getjars jupidator)" distbased $(use nls && echo i18n) jar faq changelog || die "eant failed" - cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed" - cd resources/ffdecode || die - CC=$(tc-getCC) NOSTRIP=true emake linuxdyn || die "make failed" -} - -src_install() { - java-pkg_dojar dist/Jubler.jar - use spell && java-pkg_register-dependency zemberek zemberek2-cekirdek.jar - use spell && java-pkg_register-dependency zemberek zemberek2-tr.jar - java-pkg_doso resources/ffdecode/libffdecode.so - doicon resources/installers/linux/jubler.png - domenu resources/installers/linux/jubler.desktop - - DESTDIR="${D}" eant linuxdesktopintegration - rm -vr "${D}/usr/share/menu" || die - - java-pkg_dolauncher jubler --main com.panayotis.jubler.Main - dohtml ChangeLog.html || die "dohtml failed" - dodoc README || die "dodoc failed" - doman resources/installers/linux/jubler.1 || die "doman fialed" - insinto /usr/share/jubler/help - doins dist/help/* || die "doins failed" -} - -pkg_preinst() { - gnome2_pkg_preinst - java-pkg-2_pkg_preinst -} diff --git a/media-video/jubler/jubler-4.1.1.ebuild b/media-video/jubler/jubler-4.1.1.ebuild deleted file mode 100644 index 8b338df1e8b2..000000000000 --- a/media-video/jubler/jubler-4.1.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.1.1.ebuild,v 1.3 2010/04/17 04:34:26 serkan Exp $ - -EAPI="2" -inherit gnome2-utils eutils java-pkg-2 java-ant-2 toolchain-funcs - -MY_PN=${PN/#j/J} -DESCRIPTION="Java subtitle editor" -HOMEPAGE="http://www.jubler.org/" -SRC_URI="mirror://gentoo/${MY_PN}-src-${PV}.tar.bz2" -# This is a patched tarball generated from Mercurial. - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="mplayer nls spell" - -RDEPEND=">=virtual/jre-1.5 - >=media-video/ffmpeg-0.4.9_p20080326 - mplayer? ( media-video/mplayer[ass] ) - spell? - ( - app-text/aspell - >=dev-java/zemberek-2.0[linguas_tr] - ) - >=dev-java/jupidator-0.3.0" - -DEPEND=">=virtual/jdk-1.5 - >=media-video/ffmpeg-0.4.9_p20080326 - app-text/docbook-sgml-utils - dev-util/pkgconfig - nls? ( sys-devel/gettext ) - dev-java/jupidator" - -S=${WORKDIR}/${MY_PN}-${PV} - -java_prepare() { - chmod +x resources/installers/linux/iconinstall - JAVA_ANT_CLASSPATH_TAGS="java javac" java-ant_rewrite-classpath - java-ant_rewrite-classpath nbproject/build-impl.xml -} - -src_compile() { - java-pkg_filter-compiler ecj-3.2 - eant -Dgentoo.classpath="$(java-pkg_getjars jupidator)" distbased $(use nls && echo i18n) jar faq || die "eant failed" - cp -v dist/help/jubler-faq.html build/classes/help || die "cp failed" - cd resources/ffdecode || die - CC=$(tc-getCC) NOSTRIP=true emake linuxdyn || die "make failed" -} - -src_install() { - java-pkg_dojar dist/Jubler.jar - use spell && java-pkg_register-dependency zemberek zemberek2-cekirdek.jar - use spell && java-pkg_register-dependency zemberek zemberek2-tr.jar - java-pkg_doso resources/ffdecode/libffdecode.so - doicon resources/installers/linux/jubler.png - domenu resources/installers/linux/jubler.desktop - - DESTDIR="${D}" eant linuxdesktopintegration - rm -vr "${D}/usr/share/menu" || die - - java-pkg_dolauncher jubler --main com.panayotis.jubler.Main - dohtml ChangeLog.html || die "dohtml failed" - dodoc README || die "dodoc failed" - doman resources/installers/linux/jubler.1 || die "doman fialed" - insinto /usr/share/jubler/help - doins dist/help/* || die "doins failed" -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/media-video/videotrans/Manifest b/media-video/videotrans/Manifest index e7a1b0a07b26..dc12a6c937c5 100644 --- a/media-video/videotrans/Manifest +++ b/media-video/videotrans/Manifest @@ -1,5 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX videotrans-1.6.0-forced-as-needed.patch 1248 RMD160 633bfe95c1b59d40caaa7958383e44db126d6cc6 SHA1 10afae578e0c05bb36835ed23328a6f543f6a620 SHA256 7c57349fc0b2c8dd2d228724420628a49fda1390822fc003861a5d83adda9f5b DIST videotrans-1.6.0.tar.bz2 91205 RMD160 dc22a60d7fce3e36c54ff84988700ff89bd48c53 SHA1 7939c3c663251e45df88a2bce66e7299452b0882 SHA256 96595d2cb9b53406c9cb364d348645568b2f2f615e64dc2377ac74521d5d3cce -EBUILD videotrans-1.6.0.ebuild 1036 RMD160 7fbad3e4da34760024841e2d5cd33ad19f7c6480 SHA1 15be2759fff8dbd67c0267354cf3f53371e45b28 SHA256 bc007b91b0f84e89895f505675648423cf149e396cab59a25911747646a5ac40 -MISC ChangeLog 1201 RMD160 777a5a40639d08c4848b02d2397c8f9587afe7e9 SHA1 7c6b92fcd78202ce92b528f0840e5b6a6c3ffae9 SHA256 e78f78045eb6c7fff6691d8b9f0833aae0c65bf610c2c320e6d33f295561700a +EBUILD videotrans-1.6.0.ebuild 837 RMD160 d7a28070d9cf51b73dbe5eee202356ff4283f441 SHA1 6ff2b86f138ebd495fae69e3d525861a505b3f84 SHA256 f76409593323f240111870ba3aff1252f5080dc97339aae9497310ecf5512a86 +MISC ChangeLog 1345 RMD160 285fab1984e4f3afab41e275db65415de99108ab SHA1 78e623e49044b5c138e9f7fc932470112933c8d6 SHA256 7a71b2fecb19e392707f0a7f5f474cb1a039186e2ee43698fe5e79a1f220ddb8 MISC metadata.xml 545 RMD160 f6e67aafdb33cd68131205c6a289cc278427c23a SHA1 8eaf14fb76231228e11649fb7595d51b356d8c4c SHA256 388d9444521267ef15ae602416796a5530f0f701bbb2418fc68b23973b20dc58 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk3P9JIACgkQHB6c3gNBRYdO0gCffT3ZfdDpo4pVPIeZKkAMyFLI +fRkAmgOObIG5fgIzgHFnDHsZGNyZIUt9 +=q4EY +-----END PGP SIGNATURE----- |