Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (f84868c0d6a97a6a37eb83609ea54ae062faa4c2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (f84868c0d6a97a6a37eb83609ea54ae062faa4c2)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (f84868c0d6a97a6a37eb83609ea54ae062faa4c2)
  • Date: Sat, 5 Dec 2009 05:26:41 -0600
GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

video-libs/gst-plugins-bad/DEPENDS | 4 ++
video-libs/gst-plugins-bad/HISTORY | 3 +
video-libs/schroedinger/DEPENDS | 1
video-libs/schroedinger/DETAILS | 5 +-
video-libs/schroedinger/HISTORY | 9 +++-
video-libs/schroedinger/PRE_BUILD | 3 -
video-libs/schroedinger/gst-libs.patch | 64
---------------------------------
7 files changed, 17 insertions(+), 72 deletions(-)

New commits:
commit f84868c0d6a97a6a37eb83609ea54ae062faa4c2
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

gst-plugins-bad: added optional_depends on schroedinger

commit 8b48639b0299aee9a64532cd938fcff018112850
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

schroedinger: added additional source url, removed optional_depends on
gstreamer

commit e5f0f71f0263711d4b68986b2a12055b68348fa9
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

Revert "Revert "schroedinger 1.0.8""

This reverts commit 03780e70b6ac51f9d3f9107bb1eb709b84952100.

commit 9ab547f8ec949fed4963224a576f455a69e92581
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

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

This reverts commit 1f8f25b585cfd937b2bef3a8c3c333c8b05acdae.

commit 1ca2185204fd63bf61c76fcfdb1820e346b073a2
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

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

This reverts commit 99b2b460a5c03c0ca3605c5eefb56ee424577640.

commit c8d98e1b8ef4068770703f4824c02fe943bcfca7
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

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

This reverts commit b3415c4b3a56576d5da567f8bf53d8c3993be3e4.

diff --git a/video-libs/gst-plugins-bad/DEPENDS
b/video-libs/gst-plugins-bad/DEPENDS
index 26e8508..970edfa 100755
--- a/video-libs/gst-plugins-bad/DEPENDS
+++ b/video-libs/gst-plugins-bad/DEPENDS
@@ -80,6 +80,10 @@ optional_depends xvid \
"--enable-xvid" \
"--disable-xvid" \
"for xvid plugin" &&
+optional_depends schroedinger \
+ "--enable-schro" \
+ "--disable-schro" \
+ "for dirac encoder/decoder" &&
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
diff --git a/video-libs/gst-plugins-bad/HISTORY
b/video-libs/gst-plugins-bad/HISTORY
index 5a746e4..86765af 100644
--- a/video-libs/gst-plugins-bad/HISTORY
+++ b/video-libs/gst-plugins-bad/HISTORY
@@ -1,3 +1,6 @@
+2009-12-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * DEPENDS: added optional_depends on schroedinger
+
2009-11-23 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.10.17

diff --git a/video-libs/schroedinger/DEPENDS b/video-libs/schroedinger/DEPENDS
index 6829509..743ffdf 100755
--- a/video-libs/schroedinger/DEPENDS
+++ b/video-libs/schroedinger/DEPENDS
@@ -1,4 +1,3 @@
depends pkgconfig &&
depends liboil &&
-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/DETAILS b/video-libs/schroedinger/DETAILS
index 96b9975..8a559d0 100755
--- a/video-libs/schroedinger/DETAILS
+++ b/video-libs/schroedinger/DETAILS
@@ -1,9 +1,10 @@
SPELL=schroedinger
- VERSION=1.0.7
-
SOURCE_HASH=sha512:dd13c77005d5deec87e13851b302429fae0e65cc3166f86085a1fbe0d8ce8e1b63b52e4e0757b20697efbbc4bc4191f3a3e1f18c52d2f434e65431c6275b4b04
+ VERSION=1.0.8
+
SOURCE_HASH=sha512:2071e91bbb6f3c34cec01240d7ee102ccf83e89a8dd05cef51873426ac46c8b698842b58af6ea48bba022c369af9ebc2c30f812b32f0475fb6d7af2e317aff02
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.diracvideo.org/download/schroedinger/$SOURCE
+ SOURCE_URL[1]=http://distfiles.macports.org/$SPELL/$SOURCE
WEB_SITE=http://www.diracvideo.org/
LICENSE[0]='GPL,LGLP,MIT,MPL'
ENTERED=20080422
diff --git a/video-libs/schroedinger/HISTORY b/video-libs/schroedinger/HISTORY
index bc640e9..61ce7d7 100644
--- a/video-libs/schroedinger/HISTORY
+++ b/video-libs/schroedinger/HISTORY
@@ -1,6 +1,11 @@
2009-12-05 Arwed v. Merkatz <v.merkatz AT gmx.net>
- * PRE_BUILD, gst-libs.patch: added patch to compile with current
- gstreamer
+ * DEPENDS: removed optional_depends on gstreamer, the plugin is now
+ part of gst-plugins-bad
+ * DETAILS: added http://distfiles.macports.org/$SPELL/$SOURCE as
+ second source url, as the main one seems to have disappeared
+
+2009-10-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.0.8

2009-04-25 Ladislav Hagara <hgr AT 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 f777257..0000000
--- 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 bb418fe..0000000
--- 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


  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (f84868c0d6a97a6a37eb83609ea54ae062faa4c2), Arwed von Merkatz, 12/05/2009

Archive powered by MHonArc 2.6.24.

Top of Page