[gstreamer-java] add gstreamer-java-1.5.patch

Levente Farkas lfarkas at fedoraproject.org
Mon Oct 17 10:40:20 UTC 2011


commit 671c04f451c1bb9836e6e6e0593ee886acac0c2d
Author: Levente Farkas <lfarkas at lfarkas.org>
Date:   Mon Oct 17 12:40:12 2011 +0200

    add gstreamer-java-1.5.patch

 gstreamer-java-1.5.patch |  122 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 122 insertions(+), 0 deletions(-)
---
diff --git a/gstreamer-java-1.5.patch b/gstreamer-java-1.5.patch
new file mode 100644
index 0000000..b0253af
--- /dev/null
+++ b/gstreamer-java-1.5.patch
@@ -0,0 +1,122 @@
+diff -urN gstreamer-java.old/src/org/gstreamer/GObject.java gstreamer-java/src/org/gstreamer/GObject.java
+--- gstreamer-java.old/src/org/gstreamer/GObject.java	2011-05-29 20:41:53.000000000 +0200
++++ gstreamer-java/src/org/gstreamer/GObject.java	2011-08-11 15:49:26.000000000 +0200
+@@ -85,7 +85,7 @@
+     public void set(String property, Object data) {
+         logger.entering("GObject", "set", new Object[] { property, data });
+         GObjectAPI.GParamSpec propertySpec = findProperty(property);
+-        if (propertySpec == null) {
++        if (propertySpec == null || data == null) {
+             throw new IllegalArgumentException("Unknown property: " + property);
+         }
+         final GType propType = propertySpec.value_type;
+@@ -281,13 +281,8 @@
+ 
+         PointerByReference refPtr = new PointerByReference();
+         GOBJECT_API.g_object_get(this, property, refPtr, null);
+-
+-        if (refPtr != null) {
+-            Pointer ptr = refPtr.getValue();
+-            return ptr;
+-        } else {
+-            throw new IllegalArgumentException("Got NULL pointer for property="+property);
+-        }
++        Pointer ptr = refPtr.getValue();
++        return ptr;
+     }
+     
+     private static GValue transform(GValue src, GType dstType) {
+@@ -561,7 +556,7 @@
+             // Ensure the native callback is removed
+             disconnect();
+         }
+-        @SuppressWarnings("unchecked")
++        @SuppressWarnings({"unchecked","rawtypes"})
+         public Object callback(Object[] parameters) {
+             
+             try {
+@@ -624,7 +619,7 @@
+         }
+         Map<Closure, ClosureProxy> map = signals.get(signal);
+         if (map != null) {
+-            ClosureProxy cb = map.remove(signal);
++            ClosureProxy cb = map.remove(closure);
+             if (cb != null) {
+                 cb.disconnect();
+             }
+diff -urN gstreamer-java.old/src/org/gstreamer/interfaces/PropertyProbe.java gstreamer-java/src/org/gstreamer/interfaces/PropertyProbe.java
+--- gstreamer-java.old/src/org/gstreamer/interfaces/PropertyProbe.java	2011-05-29 20:41:51.000000000 +0200
++++ gstreamer-java/src/org/gstreamer/interfaces/PropertyProbe.java	2011-07-28 12:07:31.000000000 +0200
+@@ -151,15 +151,11 @@
+             // specified property.
+             return null;
+         }
+-        if (valueArray != null)
++        Object[] objectArray = new Object[valueArray.n_values];
++        for (int i = 0; i < valueArray.n_values; i++)
+         {
+-            Object[] objectArray = new Object[valueArray.n_values];
+-            for (int i = 0; i < valueArray.n_values; i++)
+-            {
+-                objectArray[i] = valueArray.getValue(i);
+-            }
+-            return objectArray;
++            objectArray[i] = valueArray.getValue(i);
+         }
+-        else return null;
++        return objectArray;
+     }
+ }
+diff -urN gstreamer-java.old/src/org/gstreamer/lowlevel/GNative.java gstreamer-java/src/org/gstreamer/lowlevel/GNative.java
+--- gstreamer-java.old/src/org/gstreamer/lowlevel/GNative.java	2011-06-24 01:08:19.000000000 +0200
++++ gstreamer-java/src/org/gstreamer/lowlevel/GNative.java	2011-07-28 11:58:00.000000000 +0200
+@@ -118,7 +118,7 @@
+         public Object toNative(Object value) {
+             return value != null ? EnumMapper.getInstance().intValue((Enum<?>) value) : 0;
+         }
+-        @SuppressWarnings(value = "unchecked")
++        @SuppressWarnings({"unchecked","rawtypes"})
+         public Object fromNative(Object value, Class javaType) {
+             return EnumMapper.getInstance().valueOf((Integer) value, javaType);
+         }
+@@ -133,7 +133,7 @@
+         public Object toNative(Object value) {
+             return value != null ? Boolean.TRUE.equals(value) ? 1 : 0 : 0;
+         }
+-        @SuppressWarnings(value = "unchecked")
++        @SuppressWarnings("rawtypes")
+         public Object fromNative(Object value, Class javaType) {
+             return value != null ? ((Integer) value).intValue() != 0 : 0;
+         }
+diff -urN gstreamer-java.old/src/org/gstreamer/lowlevel/GTypeMapper.java gstreamer-java/src/org/gstreamer/lowlevel/GTypeMapper.java
+--- gstreamer-java.old/src/org/gstreamer/lowlevel/GTypeMapper.java	2011-05-29 20:41:52.000000000 +0200
++++ gstreamer-java/src/org/gstreamer/lowlevel/GTypeMapper.java	2011-07-28 12:09:13.000000000 +0200
+@@ -151,8 +151,8 @@
+             return Integer.class;
+         }
+ 
+-        @SuppressWarnings("unchecked")
+-        public Object toNative(Object arg, ToNativeContext context) {
++        @SuppressWarnings("rawtypes")
++        public Object toNative(Object arg, ToNativeContext context) {
+             if (arg == null) {
+                 return null;
+             }
+@@ -268,7 +268,7 @@
+             return String.class;
+         }
+     };
+-    @SuppressWarnings("unchecked")
++    @SuppressWarnings("rawtypes")
+ 	public FromNativeConverter getFromNativeConverter(Class type) {
+         if (Enum.class.isAssignableFrom(type)) {
+             return enumConverter;              
+@@ -286,7 +286,7 @@
+         return super.getFromNativeConverter(type);
+     }
+ 
+-    @SuppressWarnings("unchecked")
++    @SuppressWarnings("rawtypes")
+ 	public ToNativeConverter getToNativeConverter(Class type) {
+         if (NativeObject.class.isAssignableFrom(type)) {
+             return nativeObjectConverter;


More information about the scm-commits mailing list