Commit 26bdfed7 authored by David Flynn's avatar David Flynn Committed by Jean-Baptiste Kempf

contrib: bump schroedinger and liboil versions

- bump schroedinger to 1.0.6
- patch schroedinger with build fixes from unreleased git
- bump liboil to 0.3.16
- remove liboil-noshared patch
Signed-off-by: default avatarDavid Flynn <davidf@rd.bbc.co.uk>
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 0a2a450c
...@@ -2482,7 +2482,6 @@ liboil-$(OIL_VERSION).tar.gz: ...@@ -2482,7 +2482,6 @@ liboil-$(OIL_VERSION).tar.gz:
liboil: liboil-$(OIL_VERSION).tar.gz liboil: liboil-$(OIL_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -d liboil -p1 < Patches/liboil-noshared.patch
.liboil: liboil .liboil: liboil
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2" && make && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O2" && make && make install)
...@@ -2501,6 +2500,7 @@ schroedinger-$(SCHROED_VERSION).tar.gz: ...@@ -2501,6 +2500,7 @@ schroedinger-$(SCHROED_VERSION).tar.gz:
schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz schroedinger: schroedinger-$(SCHROED_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -d schroedinger -p1 < Patches/schroedinger-1.0.6-fixes.patch
.schroedinger: schroedinger .liboil .schroedinger: schroedinger .liboil
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install) (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -O3" && make && make install)
......
--- liboil-0.3.15/liboil/Makefile.in 2008-07-01 04:46:08.000000000 +0000
+++ liboil/liboil/Makefile.in 2008-07-04 23:09:27.518585545 +0000
@@ -1207,25 +1207,30 @@
liboilarray.c: liboiltmp1.la Makefile
+ ../libtool --config > .libs/libtoolcfg
echo '/* This file is autogenerated. Do not edit */' >liboilarray.c.tmp
echo >>liboilarray.c.tmp
echo '#include <liboil/liboilfunction.h>' >>liboilarray.c.tmp
echo >>liboilarray.c.tmp
- grep '^_oil_function_class_' .libs/liboiltmp1.exp | \
- sed -e 's/ .*//' -e 's/.*/extern OilFunctionClass &;/' >>liboilarray.c.tmp
+ . .libs/libtoolcfg; eval "$$NM .libs/liboiltmp1.a | $$global_symbol_pipe " | \
+ sed -e /^[^D]/D -e 's/^. [^ ]* \([^ ]*\)/\1/' | grep ^_oil_function_class_ | \
+ sed -e 's/.*/extern OilFunctionClass &;/' >>liboilarray.c.tmp
echo >>liboilarray.c.tmp
echo 'OilFunctionClass *_oil_function_class_array[] = {' >>liboilarray.c.tmp
- grep '^_oil_function_class_' .libs/liboiltmp1.exp | \
- sed -e 's/ .*//' -e 's/.*/ \&&,/' >>liboilarray.c.tmp
+ . .libs/libtoolcfg; eval "$$NM .libs/liboiltmp1.a | $$global_symbol_pipe " | \
+ sed -e /^[^D]/D -e 's/^. [^ ]* \([^ ]*\)/\1/' | grep ^_oil_function_class_ | \
+ sed -e 's/.*/ \&&,/' >>liboilarray.c.tmp
echo ' NULL' >>liboilarray.c.tmp
echo '};' >>liboilarray.c.tmp
echo >>liboilarray.c.tmp
- grep '^_oil_function_impl_' .libs/liboiltmp1.exp | \
- sed -e 's/ .*//' -e 's/.*/extern OilFunctionImpl &;/' >>liboilarray.c.tmp
+ . .libs/libtoolcfg; eval "$$NM .libs/liboiltmp1.a | $$global_symbol_pipe " | \
+ sed -e /^[^D]/D -e 's/^. [^ ]* \([^ ]*\)/\1/' | grep ^_oil_function_impl_ | \
+ sed -e 's/.*/extern OilFunctionImpl &;/' >>liboilarray.c.tmp
echo >>liboilarray.c.tmp
echo 'OilFunctionImpl *_oil_function_impl_array[] = {' >>liboilarray.c.tmp
- grep '^_oil_function_impl_' .libs/liboiltmp1.exp | \
- sed -e 's/ .*//' -e 's/.*/ \&&,/' >>liboilarray.c.tmp
+ . .libs/libtoolcfg; eval "$$NM .libs/liboiltmp1.a | $$global_symbol_pipe " | \
+ sed -e /^[^D]/D -e 's/^. [^ ]* \([^ ]*\)/\1/' | grep ^_oil_function_impl_ | \
+ sed -e 's/.*/ \&&,/' >>liboilarray.c.tmp
echo ' NULL' >>liboilarray.c.tmp
echo '};' >>liboilarray.c.tmp
echo >>liboilarray.c.tmp
diff --git a/schroedinger/schroasync-win32.c b/schroedinger/schroasync-win32.c
index 0912e81..3bf2fb0 100644
--- a/schroedinger/schroasync-win32.c
+++ b/schroedinger/schroasync-win32.c
@@ -166,8 +166,8 @@ void
schro_async_start (SchroAsync *async)
{
int i;
- for(i=0;i<async->n_threads) {
- SetEvent (async->thread_event);
+ for(i=0;i<async->n_threads;i++) {
+ SetEvent (async->threads[i].event);
}
}
@@ -332,7 +332,7 @@ schro_thread_main (void *ptr)
* a lot of unnecessary wakeups in some cases. */
{
int i;
- for(i=0;i<async->n_threads) {
+ for(i=0;i<async->n_threads;i++) {
SetEvent (async->thread_event);
}
}
diff --git a/schroedinger/schrodecoder.c b/schroedinger/schrodecoder.c
index d915c34..1ca348e 100644
--- a/schroedinger/schrodecoder.c
+++ b/schroedinger/schrodecoder.c
@@ -683,6 +683,7 @@ schro_decoder_pull (SchroDecoder *decoder)
{
SchroDecoderInstance *instance = decoder->instance;
SchroPicture *picture = NULL;
+ SchroPictureNumber picture_number;
SchroFrame *frame;
schro_async_lock (decoder->async);
@@ -697,12 +698,12 @@ schro_decoder_pull (SchroDecoder *decoder)
/* XXX would be nice to warn if expected picture not present */
frame = schro_frame_ref (picture->output_picture);
+ picture_number = picture->picture_number;
schro_picture_unref (picture);
if (schro_decoder_frame_is_twofield (instance, frame)) do {
/* only consider the 2nd field if it can reference
* picture->output_picture, ie frame is twofields */
- SchroPictureNumber picture_number = picture->picture_number;
if (picture_number&1) {
/* The following is voilated:
* - 10.4p3 earliest field in each frame shall have an even picture number
diff --git a/testsuite/motion.c b/testsuite/motion.c
index 9c52683..60e5739 100644
--- a/testsuite/motion.c
+++ b/testsuite/motion.c
@@ -13,24 +13,6 @@
#define OIL_ENABLE_UNSTABLE_API
#include <liboil/liboilprofile.h>
-void
-schro_frame_data_clear (SchroFrameData *fd)
-{
- int i;
- for(i=0;i<fd->height;i++){
- memset (SCHRO_FRAME_DATA_GET_LINE (fd, i), 0, fd->width);
- }
-
-}
-
-void
-schro_frame_clear (SchroFrame *frame)
-{
- schro_frame_data_clear (frame->components + 0);
- schro_frame_data_clear (frame->components + 1);
- schro_frame_data_clear (frame->components + 2);
-}
-
int
main (int argc, char *argv[])
{
diff --git a/testsuite/motion2.c b/testsuite/motion2.c
index e90ff70..c6f4cc7 100644
--- a/testsuite/motion2.c
+++ b/testsuite/motion2.c
@@ -15,14 +15,6 @@
#include <liboil/liboilrandom.h>
void
-schro_frame_clear (SchroFrame *frame)
-{
- memset(frame->components[0].data, 0, frame->components[0].length);
- memset(frame->components[1].data, 0, frame->components[1].length);
- memset(frame->components[2].data, 0, frame->components[2].length);
-}
-
-void
schro_frame_create_pattern (SchroFrame *frame, int type)
{
int i,j,k;
...@@ -222,9 +222,9 @@ KATE_VERSION=0.3.0 ...@@ -222,9 +222,9 @@ KATE_VERSION=0.3.0
KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz
TIGER_VERSION=0.3.1 TIGER_VERSION=0.3.1
TIGER_URL=http://libtiger.googlecode.com/files/libtiger-$(TIGER_VERSION).tar.gz TIGER_URL=http://libtiger.googlecode.com/files/libtiger-$(TIGER_VERSION).tar.gz
OIL_VERSION=0.3.15 OIL_VERSION=0.3.16
OIL_URL=http://liboil.freedesktop.org/download/liboil-$(OIL_VERSION).tar.gz OIL_URL=http://liboil.freedesktop.org/download/liboil-$(OIL_VERSION).tar.gz
SCHROED_VERSION=1.0.4 SCHROED_VERSION=1.0.6
SCHROED_URL=http://www.diracvideo.org/download/schroedinger/schroedinger-$(SCHROED_VERSION).tar.gz SCHROED_URL=http://www.diracvideo.org/download/schroedinger/schroedinger-$(SCHROED_VERSION).tar.gz
ASS_VERSION=0.9.5 ASS_VERSION=0.9.5
ASS_URL=$(SF)/libass/libass-$(ASS_VERSION).tar.bz2 ASS_URL=$(SF)/libass/libass-$(ASS_VERSION).tar.bz2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment