rpms/gstreamer-java/F-10 gstreamer-java-1.2-swt.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gstreamer-java.spec, 1.3, 1.4 import.log, 1.2, 1.3 sources, 1.3, 1.4

[Levente Farkas]

Author: lfarkas

Update of /cvs/pkgs/rpms/gstreamer-java/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5747/F-10

Modified Files:
	.cvsignore gstreamer-java.spec import.log sources 
Added Files:
	gstreamer-java-1.2-swt.patch 
Log Message:
update to 1.2


gstreamer-java-1.2-swt.patch:

--- NEW FILE gstreamer-java-1.2-swt.patch ---
diff -up ./src/org/gstreamer/interfaces/XOverlay.java.lfarkas ./src/org/gstreamer/interfaces/XOverlay.java
--- ./src/org/gstreamer/interfaces/XOverlay.java.lfarkas	2009-06-30 21:12:32.000000000 +0200
+++ ./src/org/gstreamer/interfaces/XOverlay.java	2009-06-30 21:12:55.000000000 +0200
@@ -20,7 +20,6 @@
 
 package org.gstreamer.interfaces;
 
-import org.eclipse.swt.SWT;
 import org.gstreamer.Element;
 import org.gstreamer.lowlevel.GstNative;
 import org.gstreamer.lowlevel.GstXOverlayAPI;
@@ -76,22 +75,6 @@ public class XOverlay extends GstInterfa
     }
     
     /**
-     * Sets the native window for the {@link Element} to use to display video.
-     *
-     * @param window A native window to use to display video, or <tt>null</tt> to
-     * stop using the previously set window.
-     */
-    public void setWindowID(org.eclipse.swt.widgets.Composite comp) {
-    	//Composite style must be embedded
-        if (!Platform.isLinux() || comp == null || (comp.getStyle() | SWT.EMBEDDED) == 0) {
-            gst.gst_x_overlay_set_xwindow_id(this, new NativeLong(0));
-            return;
-        }
-    	//TODO: Test on windows and mac
-        gst.gst_x_overlay_set_xwindow_id(this, new NativeLong(comp.embeddedHandle));
-    }
-    
-    /**
      * Tell an overlay that it has been exposed. This will redraw the current frame
      * in the drawable even if the pipeline is PAUSED.
      */


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	14 Nov 2008 15:11:54 -0000	1.3
+++ .cvsignore	30 Jun 2009 19:56:23 -0000	1.4
@@ -1 +1 @@
-gstreamer-java-src-1.0.zip
+gstreamer-java-src-1.2.zip


Index: gstreamer-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/F-10/gstreamer-java.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gstreamer-java.spec	14 Nov 2008 15:11:54 -0000	1.3
+++ gstreamer-java.spec	30 Jun 2009 19:56:23 -0000	1.4
@@ -1,6 +1,8 @@
+%global arch_with_swt %{ix86} x86_64 ppc ppc64 ia64 sparc sparc64
+
 Summary:	Java interface to the gstreamer framework
 Name:		gstreamer-java
-Version:	1.0
+Version:	1.2
 Release:	1%{?dist}
 License:	LGPLv3 and CC-BY-SA
 Group:		System Environment/Libraries
@@ -12,10 +14,12 @@ URL:		http://code.google.com/p/gstreamer
 #Source:	http://gstreamer-java.googlecode.com/files/%{name}-src-%{version}.tar.bz2
 # but now use the released version
 Source:		http://gstreamer-java.googlecode.com/files/%{name}-src-%{version}.zip
-BuildArch:	noarch
+Patch:		%{name}-%{version}-swt.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# for ExcludeArch see bug: 468831
-ExcludeArch:	ppc, ppc64
+# for ExcludeArch and no noarch see bug: 468831
+# since noarch pacakge can't contain ExcludeArch :-( imho it's an rpm bug
+#BuildArch:	noarch
+ExcludeArch:	ppc ppc64
 
 Requires:	java >= 1:1.6.0
 Requires:	jpackage-utils
@@ -31,15 +35,17 @@ Conflicts:	gstreamer-plugins-bad < 0.10.
 BuildRequires:	java-devel >= 1:1.6.0
 BuildRequires:	jpackage-utils
 BuildRequires:	jna
+%ifarch %{arch_with_swt}
 BuildRequires:	libswt3-gtk2
+%endif
 BuildRequires:	gstreamer-devel >= 0.10.19
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10.19
 BuildRequires:	gstreamer-plugins-good-devel >= 0.10.7
 #BuildRequires:	gstreamer-plugins-ugly-devel >= 0.10.7
 #BuildRequires:	gstreamer-plugins-bad-devel >= 0.10.6
-%if 0%{?fedora} >= 9
 BuildRequires:	ant
 BuildRequires:	ant-junit
+%if 0%{?fedora} >= 9
 BuildRequires:	junit4
 %endif
 
@@ -58,33 +64,37 @@ This package contains the API documentat
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-src-%{version}
 cp -p src/org/freedesktop/tango/COPYING COPYING.CC-BY-SA
 # remove prebuild binaries
 find . -name '*.jar' -exec rm {} \;
 
-
-%build
-# replace included jar files with the system packaged version (JNA, SWT)
+# replace included jar files with the system packaged version (JNA, SWT, GStreamer plugins dir)
 sed -i -e "s,\(file.reference.jna.jar=\).*,\1$(build-classpath jna)," \
 	-e "s,\(run.jvmargs=-Djna.library.path=\).*,\1%{_libdir}:$(pkg-config --variable=pluginsdir gstreamer-0.10)," \
 	nbproject/project.properties
 
+%ifarch %{arch_with_swt}
+sed -i -e "s,\(file.reference.swt.jar=\).*,\1$(find %{_libdir} -name swt*.jar 2>/dev/null|sort|head -1)," \
+	nbproject/project.properties
+%else
+%patch -p1
+rm -rf src/org/gstreamer/swt src/org/gstreamer/example/SWTOverlayPlayer.java
+%endif
+
+
+%build
 # from Fedora-9 we've got ant-1.7.0 and junit4 while on older releases and EPEL
-# have only ant-1.6.5 and junit-3.8.2
+# have only ant-1.6.5 and junit-3.8.2 therefore on older releases and EPEL we
+# have small hacks like ant-1.6.5 need packagenames for javadoc task
+# and test targets need ant-1.7.x and junit4 so we skip the test during packaging
 %if 0%{?fedora} >= 9
-sed -i -e "s,\(file.reference.swt.jar=\).*,\1$(build-classpath swt)," \
-	-e "s,\(file.reference.junit-4.4.jar=\).*,\1$(build-classpath junit4)," \
+sed -i -e "s,\(file.reference.junit-4.4.jar=\).*,\1$(build-classpath junit4)," \
 	nbproject/project.properties
 ant
 %else
-# from Fedora-9 we've got swt.jar at the standard path (ie. build-classpath 
-# find it), but older releases and EPEL we've to find it and
-sed -i -e "s,\(file.reference.swt.jar=\).*,\1$(find %{_libdir} -name swt*.jar 2>/dev/null|sort|head -1)," \
-	nbproject/project.properties
-# ant-1.6.5 need packagenames for javadoc task
-sed -i -e 's,\(<javadoc destdir="${dist.javadoc.dir}" source="${javac.source}"\),\1 packagenames="*",' build.xml
-# test targets need ant-1.7.x and junit4 so we skip the test during packaging.
+sed -i -e 's,\(<javadoc destdir="${dist.javadoc.dir}" source="${javac.source}"\),\1 packagenames="*",' \
+	build.xml
 ant jar
 ant javadoc
 %endif
@@ -113,6 +123,17 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jun 30 2009 Levente Farkas <lfarkas at lfarkas.org> - 1.2-1
+- update to the new upstream version
+- don't use build-classpath for SWT on any platform since it's broken in most cases
+- add suport for platfrom which has no SWT support
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Thu Feb 12 2009 Levente Farkas <lfarkas at lfarkas.org> - 1.0-2
+- fix spec file to build on x86_64 too
+
 * Tue Nov 11 2008 Levente Farkas <lfarkas at lfarkas.org> - 1.0-1
 - update to the new upstream version
 - fix EPEL build problems (ant-1.7.0 and junit4)


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/F-10/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	14 Nov 2008 15:11:54 -0000	1.2
+++ import.log	30 Jun 2009 19:56:23 -0000	1.3
@@ -1,2 +1,3 @@
 gstreamer-java-0_9-0_2_20081023hg_fc9:F-10:gstreamer-java-0.9-0.2.20081023hg.fc9.src.rpm:1225103356
 gstreamer-java-1_0-1_fc9:F-10:gstreamer-java-1.0-1.fc9.src.rpm:1226675229
+gstreamer-java-1_2-1_fc10:F-10:gstreamer-java-1.2-1.fc10.src.rpm:1246391733


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-java/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	14 Nov 2008 15:11:54 -0000	1.3
+++ sources	30 Jun 2009 19:56:23 -0000	1.4
@@ -1 +1 @@
-639d5b64fbf71054ddc4bbb02e84f398  gstreamer-java-src-1.0.zip
+037543f25cf20c264691ec06673ab79e  gstreamer-java-src-1.2.zip