Revert "schroedinger: added patch to compile with current gstreamer"

This reverts commit 1f8f25b585cfd937b2bef3a8c3c333c8b05acdae.

4 files changed, 1 insertions, 72 deletions

diff --git a/video-libs/schroedinger/DEPENDS b/video-libs/schroedinger/DEPENDS
index 29b1de3ff6..682950972b 100755
--- a/video-libs/schroedinger/DEPENDS
+++ b/video-libs/schroedinger/DEPENDS
@@ -1,4 +1,4 @@
 depends pkgconfig  &&
 depends liboil     &&
-#optional_depends gstreamer '--enable-gstreamer' '--disable-gstreamer' 'gstreamer plugin'  &&
+optional_depends gstreamer '--enable-gstreamer' '--disable-gstreamer' 'gstreamer plugin'  &&
 optional_depends gtk-doc   '--enable-gtk-doc'   '--disable-gtk-doc' 'build documentation'
diff --git a/video-libs/schroedinger/HISTORY b/video-libs/schroedinger/HISTORY
index bc640e995f..2e24363c27 100644
--- a/video-libs/schroedinger/HISTORY
+++ b/video-libs/schroedinger/HISTORY
@@ -1,7 +1,3 @@
-2009-12-05 Arwed v. Merkatz <v.merkatz@gmx.net>
-	* PRE_BUILD, gst-libs.patch: added patch to compile with current
-	gstreamer
-
 2009-04-25 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 1.0.7
 
diff --git a/video-libs/schroedinger/PRE_BUILD b/video-libs/schroedinger/PRE_BUILD
deleted file mode 100755
index f77725724d..0000000000
--- a/video-libs/schroedinger/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/gst-libs.patch
diff --git a/video-libs/schroedinger/gst-libs.patch b/video-libs/schroedinger/gst-libs.patch
deleted file mode 100644
index bb418fea4d..0000000000
--- a/video-libs/schroedinger/gst-libs.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Nur schroedinger-1.0.7.orig/gst-libs/gst/video/gstbasevideoutils.c schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.c
---- schroedinger-1.0.7.orig/gst-libs/gst/video/gstbasevideoutils.c	2009-04-22 19:55:58.000000000 +0200
-+++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.c	2009-12-05 11:15:29.000000000 +0100
-@@ -230,48 +230,6 @@
- }
- 
- 
--int
--gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
--    guint32 pattern, guint32 mask, int offset, int n)
--{
--  GSList *g;
--  int j;
--  int k;
--  int skip;
--  int m;
--
--  g_return_val_if_fail (n >= 0, 0);
--  g_return_val_if_fail (offset >= 0, 0);
--  g_return_val_if_fail (offset + n + 4 <= adapter->size, 0);
--
--  g = get_chunk (adapter, offset, &skip);
--  j = 0;
--  while (j < n) {
--    m = MIN (GST_BUFFER_SIZE(GST_BUFFER(g->data)) - skip - 4, 0);
--    if (m > 0) {
--      k = scan_fast (GST_BUFFER_DATA(GST_BUFFER(g->data)) + skip,
--          pattern, mask, m);
--      if (k < m) {
--        return offset+j+k;
--      }
--      j += m;
--      skip += m;
--    } else {
--      if (scan_slow (adapter, g, skip, pattern, mask)) {
--        return offset + j;
--      }
--      j++;
--      skip++;
--    }
--    if (skip >= GST_BUFFER_SIZE (GST_BUFFER(g->data))) {
--      g = g->next;
--      skip = 0;
--    }
--  }
--
--  return n;
--}
--
- GstBuffer *
- gst_adapter_get_buffer (GstAdapter *adapter)
- {
-diff -Nur schroedinger-1.0.7.orig/gst-libs/gst/video/gstbasevideoutils.h schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.h
---- schroedinger-1.0.7.orig/gst-libs/gst/video/gstbasevideoutils.h	2009-04-22 19:56:06.000000000 +0200
-+++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoutils.h	2009-12-05 11:15:11.000000000 +0100
-@@ -84,8 +84,6 @@
- GstClockTime gst_video_state_get_timestamp (const GstVideoState *state,
-     int frame_number);
- 
--int gst_adapter_masked_scan_uint32 (GstAdapter *adapter,
--    guint32 pattern, guint32 mask, int offset, int n);
- GstBuffer *gst_adapter_get_buffer (GstAdapter *adapter);
- 
- G_END_DECLS