ebuild cleanup, added new IDCT patch (includes MMX/SSE also for amd64), added XDG patch, installs icon, renamed projectx_nogui to projectx_cli.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 85 insertions, 5 deletions

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
index e8bf9d4071ed..f35638733b13 100644
--- a/media-video/projectx/files/build-0.90.4.00_p33.xml
+++ b/media-video/projectx/files/build-0.90.4.00_p33.xml
@@ -9,7 +9,7 @@
 	<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" />
+	<property name="target.jdk" value="1.5" />
 
 	<!-- classpath -->
 	<path id="refcp">
@@ -50,7 +50,7 @@
 	<!-- generate javadocs -->
 	<target name="javadoc" depends="init">
 		<javadoc sourcepath="${src.dir}"
-			packagenames="net.*, edu.*"
+			packagenames="*"
            		destdir="${docs.dir}"
            		author="true"
            		version="true"
diff --git a/media-video/projectx/files/icon.png b/media-video/projectx/files/icon.png
new file mode 100644
index 000000000000..f21cff00ebfa
--- /dev/null
+++ b/media-video/projectx/files/icon.png
diff --git a/media-video/projectx/files/projectx-0.90.4.00_p33-idctfast.patch b/media-video/projectx/files/projectx-0.90.4.00_p33-idctfast.patch
new file mode 100644
index 000000000000..8421dd36ae94
--- /dev/null
+++ b/media-video/projectx/files/projectx-0.90.4.00_p33-idctfast.patch
@@ -0,0 +1,37 @@
+--- src/net/sourceforge/dvb/projectx/video/MpvDecoder.java	2009-12-31 15:24:13.000000000 +0100
++++ src/net/sourceforge/dvb/projectx/video/MpvDecoder.java	2010-07-31 14:32:19.945223425 +0200
+@@ -72,7 +72,7 @@
+ 
+ public class MpvDecoder extends Object {
+ 
+-	private IDCTRefNative idct;
++	private IDCTFast idct;
+ 	private IDCTSseNative idctsse;
+ 
+ 	private int preview_horizontal_size = 512;
+@@ -134,13 +134,13 @@
+ 	{
+ 		Arrays.fill(pixels2, 0xFF505050);
+ 
+-		idct = new IDCTRefNative();
++		idct = new IDCTFast();
+ 		idctsse = new IDCTSseNative();
+ 
+-		if (IDCTRefNative.isLibraryLoaded())
++		if (IDCTFast.isLibraryLoaded())
+ 			idct.init();
+ 
+-		if (IDCTRefNative.isLibraryLoaded() || IDCTSseNative.isLibraryLoaded())
++		if (IDCTFast.isLibraryLoaded() || IDCTSseNative.isLibraryLoaded())
+ 			acceleration = true;
+ 	}
+ 
+@@ -2399,7 +2399,7 @@
+ 			}
+ 		}
+ 
+-		else if (IDCTRefNative.isLibraryLoaded() && isAccelerated())
++		else if (IDCTFast.isLibraryLoaded() && isAccelerated())
+ 		{
+ 			/* copy or add block data into picture */
+ 			for (comp=0; comp<block_count; comp++)
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
index ce665308807a..47f7d71c04cb 100644
--- 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
@@ -1,6 +1,5 @@
-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
+--- src/net/sourceforge/dvb/projectx/common/GuiInterface.java	2008-12-04 01:47:03.000000000 +0100
++++ src/net/sourceforge/dvb/projectx/common/GuiInterface.java	2008-12-04 02:21:11.342918380 +0100
 @@ -190,7 +190,7 @@
  			impl.updateProgressBar(percent);
  
diff --git a/media-video/projectx/files/projectx-0.90.4.00_p33-xdg.patch b/media-video/projectx/files/projectx-0.90.4.00_p33-xdg.patch
new file mode 100644
index 000000000000..1cb675af4ebb
--- /dev/null
+++ b/media-video/projectx/files/projectx-0.90.4.00_p33-xdg.patch
@@ -0,0 +1,44 @@
+--- src/net/sourceforge/dvb/projectx/common/Settings.java	2008-02-18 19:34:48.000000000 +0100
++++ src/net/sourceforge/dvb/projectx/common/Settings.java	2010-07-31 19:44:59.151224244 +0200
+@@ -46,6 +46,8 @@
+ import java.util.Set;
+ import java.util.TreeMap;
+ 
++import xdg.*;
++
+ import net.sourceforge.dvb.projectx.xinput.XInputDirectory;
+ 
+ /**
+@@ -56,7 +58,7 @@
+ public class Settings extends Object {
+ 
+ 	/** the default ini filename */
+-	private static final String DEFAULT_INI = "X.ini";
++	private static final String DEFAULT_INI = "Project-X.ini";
+ 
+ 	/** the current ini filename */
+ 	private String inifile = "";
+@@ -75,7 +77,7 @@
+ 	 */
+ 	public Settings()
+ 	{
+-		this(Resource.workdir + Resource.filesep + DEFAULT_INI);
++		this(xdg.config_home() + Resource.filesep + DEFAULT_INI);
+ 	}
+ 
+ 	/**
+@@ -161,6 +163,7 @@
+ 			str = inifile;
+ 
+ 		try {
++			xdg.mkdirs_file(str);
+ 			PrintWriter w = new PrintWriter(new FileWriter(str));
+ 
+ 			String base_key = "# Project-X INI";
+@@ -714,4 +717,4 @@
+ 		return inifile;
+ 	}
+ 
+-}
+\ Kein Zeilenumbruch am Dateiende.
++}