summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/jubler')
-rw-r--r--media-video/jubler/ChangeLog9
-rw-r--r--media-video/jubler/files/jubler-4.6.1-gentoo.patch11
-rw-r--r--media-video/jubler/jubler-4.6.1-r3.ebuild (renamed from media-video/jubler/jubler-4.6.1-r2.ebuild)2
3 files changed, 19 insertions, 3 deletions
diff --git a/media-video/jubler/ChangeLog b/media-video/jubler/ChangeLog
index 33715460b94a..c58bb4e46d99 100644
--- a/media-video/jubler/ChangeLog
+++ b/media-video/jubler/ChangeLog
@@ -1,6 +1,13 @@
# 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.37 2011/02/14 20:13:45 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/ChangeLog,v 1.38 2011/02/15 18:32:38 serkan Exp $
+
+*jubler-4.6.1-r3 (15 Feb 2011)
+
+ 15 Feb 2011; Serkan Kaba <serkan@gentoo.org> -jubler-4.6.1-r2.ebuild,
+ +jubler-4.6.1-r3.ebuild, files/jubler-4.6.1-gentoo.patch:
+ Revbump to fix bug #336235 reported by Diego Elio Pettenò
+ <flameeyes@gentoo.org>.
*jubler-4.6.1-r2 (14 Feb 2011)
diff --git a/media-video/jubler/files/jubler-4.6.1-gentoo.patch b/media-video/jubler/files/jubler-4.6.1-gentoo.patch
index 3e5675fee7a7..25afdba2fcc9 100644
--- a/media-video/jubler/files/jubler-4.6.1-gentoo.patch
+++ b/media-video/jubler/files/jubler-4.6.1-gentoo.patch
@@ -116,7 +116,7 @@ diff -Nur Jubler-4.6.1/core/src/com/panayotis/jubler/os/SystemFileFinder.java Ju
DEBUG.debug(e);
diff -Nur Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile
--- Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile 2011-01-31 16:26:26.000000000 +0200
-+++ Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile 2011-02-12 14:30:05.612780001 +0200
++++ Jubler-4.6.1_patched/resources/ffmpeg/ffdecode/Makefile 2011-02-15 20:26:34.213149001 +0200
@@ -12,9 +12,6 @@
# Name of the produced library
PROJ=ffdecode
@@ -152,3 +152,12 @@ diff -Nur Jubler-4.6.1/resources/ffmpeg/ffdecode/Makefile Jubler-4.6.1_patched/r
develop:javacheck
+@@ -208,7 +203,7 @@
+ LIB:${LIBNAME}
+
+ ${LIBNAME}:${LIBRARYREQ} ${OBJS} ${RANLIBREQ}
+- ${LD} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS}
++ ${LD} ${LDFLAGS} ${GCCOPTS} -o ${LIBNAME} ${OBJS} ${LIBS}
+ ${STRIPCMD} ${LIBNAME}
+
+
diff --git a/media-video/jubler/jubler-4.6.1-r2.ebuild b/media-video/jubler/jubler-4.6.1-r3.ebuild
index b6bff9cea79c..a95aee70ec32 100644
--- a/media-video/jubler/jubler-4.6.1-r2.ebuild
+++ b/media-video/jubler/jubler-4.6.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.6.1-r2.ebuild,v 1.1 2011/02/14 20:13:45 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.6.1-r3.ebuild,v 1.1 2011/02/15 18:32:38 serkan Exp $
EAPI="2"
WANT_ANT_TASKS="ant-nodeps ant-contrib"