Version bump. Adding a new snapshot.

Package-Manager: portage-2.1.7.17/cvs/Linux i686

5 files changed, 224 insertions, 1 deletions

diff --git a/media-video/projectx/ChangeLog b/media-video/projectx/ChangeLog
index 5bcdd396abe5..e6ba44a94143 100644
--- a/media-video/projectx/ChangeLog
+++ b/media-video/projectx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/projectx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.37 2010/03/11 19:23:40 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/ChangeLog,v 1.38 2010/03/11 21:05:57 billie Exp $
+
+*projectx-0.90.4.00_p33 (11 Mar 2010)
+
+  11 Mar 2010; Daniel Pielmeier <billie@gentoo.org>
+  +projectx-0.90.4.00_p33.ebuild, +files/projectx-0.90.4.00_p33-bl2.patch,
+  +files/projectx-0.90.4.00_p33-stdout-corrupt.patch,
+  +files/build-0.90.4.00_p33.xml:
+  Version bump. Adding a new snapshot.
 
   11 Mar 2010; Joseph Jezak <josejx@gentoo.org>
   projectx-0.90.4.00_p32.ebuild:
diff --git a/media-video/projectx/files/build-0.90.4.00_p33.xml b/media-video/projectx/files/build-0.90.4.00_p33.xml
new file mode 100644
index 000000000000..e8bf9d4071ed
--- /dev/null
+++ b/media-video/projectx/files/build-0.90.4.00_p33.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+
+<project name="projectx" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="src" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="apidocs" />
+	<property name="dist.dir" value="dist" />
+	<property name="lib.dir" value="lib" />
+	<property name="resources.dir" value="resources" />
+	<property name="project.jar" value="${dist.dir}/${ant.project.name}.jar" />
+	<property name="target.jdk" value="1.4" />
+
+	<!-- classpath -->
+	<path id="refcp">
+		<fileset dir="${lib.dir}">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+	
+	<!-- init -->
+	<target name="init">
+		<mkdir dir="${dist.dir}" />
+		<mkdir dir="${docs.dir}" />
+		<mkdir dir="${build.dir}" />
+	</target>	
+
+	<!-- compile everything -->
+	<target name="compile" depends="init">
+		<javac srcdir="${src.dir}"
+			destdir="${build.dir}"
+			source="${target.jdk}"
+			target="${target.jdk}"
+			classpathref="refcp"
+			encoding="ISO-8859-1"/>
+		<copy todir="${build.dir}">
+			<fileset dir="${resources.dir}" />
+		</copy>
+	</target>
+
+	<!-- build the jar files -->
+	<target name="build" depends="compile">
+		<jar jarfile="${project.jar}" basedir="${build.dir}">
+			<manifest>
+				<attribute name="Main-Class" value="${manifest.mainclass}" />
+			</manifest>
+		</jar>
+	</target>
+	
+	<!-- generate javadocs -->
+	<target name="javadoc" depends="init">
+		<javadoc sourcepath="${src.dir}"
+			packagenames="net.*, edu.*"
+           		destdir="${docs.dir}"
+           		author="true"
+           		version="true"
+			use="true"
+			charset="UTF-8"
+			encoding="ISO-8859-1"
+           		windowtitle="${ant.project.name} API" />
+	</target>
+	
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}" />
+		<delete dir="${docs.dir}" />
+		<delete dir="${dist.dir}" />
+	</target>
+
+        <!-- zip the sources -->
+        <target name="sourcezip">
+		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
+                        <zipfileset dir="${src.dir}" />
+                </zip>
+        </target>
+
+</project>
diff --git a/media-video/projectx/files/projectx-0.90.4.00_p33-bl2.patch b/media-video/projectx/files/projectx-0.90.4.00_p33-bl2.patch
new file mode 100644
index 000000000000..7c5b48263cec
--- /dev/null
+++ b/media-video/projectx/files/projectx-0.90.4.00_p33-bl2.patch
@@ -0,0 +1,15 @@
+--- src/net/sourceforge/dvb/projectx/gui/Html.java	2006-11-25 22:28:52.000000000 +0100
++++ src/net/sourceforge/dvb/projectx/gui/Html.java	2007-06-10 13:37:59.000000000 +0200
+@@ -159,9 +159,10 @@
+ 		{
+ 			try 
+ 			{
+-				BrowserLauncher.openURL(u.toString());
++				BrowserLauncher launcher = new BrowserLauncher();
++				launcher.openURLinBrowser(u.toString());
+ 			} 
+-			catch (IOException e) 
++			catch (Exception e) 
+ 			{
+ 				Common.setMessage(Resource.getString("msg.browser.launcher.error") + " " + e);
+ 			}
diff --git a/media-video/projectx/files/projectx-0.90.4.00_p33-stdout-corrupt.patch b/media-video/projectx/files/projectx-0.90.4.00_p33-stdout-corrupt.patch
new file mode 100644
index 000000000000..ce665308807a
--- /dev/null
+++ b/media-video/projectx/files/projectx-0.90.4.00_p33-stdout-corrupt.patch
@@ -0,0 +1,12 @@
+diff -Naur ProjectX_Source_0.90.4.orig/src/net/sourceforge/dvb/projectx/common/GuiInterface.java ProjectX_Source_0.90.4/src/net/sourceforge/dvb/projectx/common/GuiInterface.java
+--- ProjectX_Source_0.90.4.orig/src/net/sourceforge/dvb/projectx/common/GuiInterface.java	2008-12-04 01:47:03.000000000 +0100
++++ ProjectX_Source_0.90.4/src/net/sourceforge/dvb/projectx/common/GuiInterface.java	2008-12-04 02:21:11.342918380 +0100
+@@ -190,7 +190,7 @@
+ 			impl.updateProgressBar(percent);
+ 
+ 		else
+-			System.out.print("\r" + percent + " %");
++			System.out.print(percent + " %");
+ 	}
+ 
+ 	/**
diff --git a/media-video/projectx/projectx-0.90.4.00_p33.ebuild b/media-video/projectx/projectx-0.90.4.00_p33.ebuild
new file mode 100644
index 000000000000..96bbdc3e9b3e
--- /dev/null
+++ b/media-video/projectx/projectx-0.90.4.00_p33.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/projectx/projectx-0.90.4.00_p33.ebuild,v 1.1 2010/03/11 21:05:57 billie Exp $
+
+EAPI=2
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils toolchain-funcs java-pkg-2 java-ant-2
+
+DESCRIPTION="Converts, splits and demuxes DVB and other MPEG recordings"
+HOMEPAGE="http://project-x.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${PN}-portable.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X mmx"
+
+COMMON_DEP="dev-java/commons-net
+	X? ( =dev-java/browserlauncher2-1* )"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.5
+	virtual/libiconv
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${PN}
+
+mainclass() {
+	# read Main-Class from MANIFEST.MF
+	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" || die
+}
+
+java_prepare() {
+	# apply stdout corruption patch (zzam@gentoo.org)
+	epatch "${FILESDIR}/${P}-stdout-corrupt.patch"
+
+	# apply BrowserLauncher2 patch
+	use X && epatch "${FILESDIR}/${P}-bl2.patch"
+	rm -rf src/edu || die
+
+	# apply idctfast patchset
+	sed -i -e "s:IDCTRefNative:IDCTFast:g" src/net/sourceforge/dvb/projectx/video/MpvDecoder.java || die
+	sed -i -e "s:gcc:\$(CC):g" -e "s: -O2::g" lib/PORTABLE/Makefile || die
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-${PV}.xml" build.xml || die
+
+	# patch location of executable
+	sed -i -e "s:^\(Exec=\).*:\1${PN}:g" *.desktop || die
+
+	# convert CRLF to LF
+	edos2unix *.txt MANIFEST.MF
+
+	# convert docs to utf-8
+	if [ -x "$(type -p iconv)" ]; then
+		for X in zutun.txt; do
+			iconv -f LATIN1 -t UTF8 -o "${X}~" "${X}" && mv -f "${X}~" "${X}" || die
+		done
+	fi
+
+	# merge/remove resources depending on USE="X"
+	if use X; then
+		mv -f htmls resources/ || die
+	else
+		rm -rf src/net/sourceforge/dvb/projectx/gui || die
+		rm resources/*.gif || die
+	fi
+
+	# update library packages
+	cd lib
+	rm -f {commons-net,jakarta-oro}*.jar || die
+	java-pkg_jar-from commons-net
+	use X && java-pkg_jar-from browserlauncher2-1.0
+	java-pkg_ensure-no-bundled-jars
+}
+
+src_compile() {
+	local IDCT="idct-mjpeg"  # default IDCT implementation
+	use x86 && use mmx && IDCT="idct-mjpeg-mmx"
+
+	eant build $(use_doc) -Dmanifest.mainclass=$(mainclass)
+
+	cd lib/PORTABLE
+	emake CC=$(tc-getCC) IDCT="${IDCT}" LDFLAGS="${LDFLAGS}" \
+		CPLAT="${CFLAGS} -O3 -ffast-math -fPIC" || die
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_doso lib/PORTABLE/libidctfast.so
+
+	java-pkg_dolauncher ${PN}_nogui --main $(mainclass) \
+		--java_args "-Djava.awt.headless=true"
+
+	if use X; then
+		java-pkg_dolauncher ${PN}_gui --main $(mainclass)
+		dosym ${PN}_gui /usr/bin/${PN} || die
+		domenu *.desktop || die
+	else
+		dosym ${PN}_nogui /usr/bin/${PN} || die
+	fi
+
+	dodoc *.txt || die
+	use doc && java-pkg_dojavadoc apidocs
+	use source && java-pkg_dosrc src
+}