head 1.3; access; symbols; locks; strict; comment @# @; 1.3 date 2009.04.23.17.43.48; author rse; state Exp; branches; next 1.2; commitid UW1KSrhLzBfToaLt; 1.2 date 2009.03.23.07.42.20; author rse; state Exp; branches; next 1.1; commitid 82mY8lmfuBXj48Ht; 1.1 date 2009.03.14.10.12.43; author rse; state Exp; branches; next ; commitid UoFubt5gmjRQbZFt; desc @@ 1.3 log @modifying package: dirac-1.0.2 20090323 -> 20090423 @ text @Index: dirac-1.0.2/Makefile.in --- dirac-1.0.2/Makefile.in.orig 2009-02-11 02:43:39 +0100 +++ dirac-1.0.2/Makefile.in 2009-04-23 19:30:09 +0200 @@@@ -74,8 +74,7 @@@@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest \ - libdirac_encoder libdirac_decoder encoder decoder util \ - unit_tests tests doc win32 + libdirac_encoder libdirac_decoder DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@@@ -219,8 +218,7 @@@@ top_builddir = @@top_builddir@@ top_srcdir = @@top_srcdir@@ SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder \ - libdirac_decoder encoder decoder util $(CPPUNITTESTS_DIR) \ - tests $(DOC_DIR) win32 + libdirac_decoder @@HAVE_DOXYGEN_FALSE@@DOC_DIR = @@HAVE_DOXYGEN_TRUE@@DOC_DIR = doc Index: schroedinger-1.0.7/schroedinger.pc.in --- schroedinger-1.0.7/schroedinger.pc.in.orig 2009-03-22 22:22:33 +0100 +++ schroedinger-1.0.7/schroedinger.pc.in 2009-04-23 19:30:09 +0200 @@@@ -1,7 +1,7 @@@@ prefix=@@prefix@@ exec_prefix=@@exec_prefix@@ libdir=@@libdir@@ -includedir=@@includedir@@/schroedinger-@@SCHRO_MAJORMINOR@@ +includedir=@@includedir@@ toolsdir=${exec_prefix}/bin @@@@ -10,6 +10,6 @@@@ Requires: @@SCHRO_PKG_DEPS@@ Version: @@VERSION@@ Libs: -L${libdir} -lschroedinger-@@SCHRO_MAJORMINOR@@ @@PTHREAD_LIBS@@ @@LIBM@@ -Cflags: -I${includedir} +Cflags: -I${includedir}/schroedinger -I${includedir} Index: schroedinger-1.0.7/schroedinger/Makefile.in --- schroedinger-1.0.7/schroedinger/Makefile.in.orig 2009-04-23 05:21:21 +0200 +++ schroedinger-1.0.7/schroedinger/Makefile.in 2009-04-23 19:30:09 +0200 @@@@ -193,7 +193,7 @@@@ CTAGS = ctags DIST_SUBDIRS = cuda opengl DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkgincludedir = $(includedir)/schroedinger-@@SCHRO_MAJORMINOR@@/schroedinger +pkgincludedir = $(includedir)/schroedinger ACLOCAL = @@ACLOCAL@@ ACLOCAL_AMFLAGS = @@ACLOCAL_AMFLAGS@@ AMDEP_FALSE = @@AMDEP_FALSE@@ @ 1.2 log @modifying package: dirac-1.0.2 20090314 -> 20090323 @ text @d3 1 a3 1 +++ dirac-1.0.2/Makefile.in 2009-03-23 08:34:16 +0100 d24 3 a26 3 Index: schroedinger-1.0.6/schroedinger.pc.in --- schroedinger-1.0.6/schroedinger.pc.in.orig 2009-03-22 22:22:33 +0100 +++ schroedinger-1.0.6/schroedinger.pc.in 2009-03-23 08:34:16 +0100 d44 3 a46 3 Index: schroedinger-1.0.6/schroedinger/Makefile.in --- schroedinger-1.0.6/schroedinger/Makefile.in.orig 2009-03-23 02:04:50 +0100 +++ schroedinger-1.0.6/schroedinger/Makefile.in 2009-03-23 08:34:16 +0100 a55 47 Index: schroedinger-1.0.6/testsuite/motion.c --- schroedinger-1.0.6/testsuite/motion.c.orig 2009-03-22 22:22:33 +0100 +++ schroedinger-1.0.6/testsuite/motion.c 2009-03-23 08:36:50 +0100 @@@@ -24,7 +24,7 @@@@ } void -schro_frame_clear (SchroFrame *frame) +my_schro_frame_clear (SchroFrame *frame) { schro_frame_data_clear (frame->components + 0); schro_frame_data_clear (frame->components + 1); @@@@ -67,11 +67,11 @@@@ dest = schro_frame_new_and_alloc (NULL, SCHRO_FRAME_FORMAT_S16_420, video_format.width, video_format.height); - schro_frame_clear(dest); + my_schro_frame_clear(dest); ref = schro_frame_new_and_alloc_extended (NULL, SCHRO_FRAME_FORMAT_U8_420, video_format.width, video_format.height, 32); - schro_frame_clear(ref); + my_schro_frame_clear(ref); uref = schro_upsampled_frame_new (ref); Index: schroedinger-1.0.6/testsuite/motion2.c --- schroedinger-1.0.6/testsuite/motion2.c.orig 2009-03-22 22:22:33 +0100 +++ schroedinger-1.0.6/testsuite/motion2.c 2009-03-23 08:37:02 +0100 @@@@ -15,7 +15,7 @@@@ #include void -schro_frame_clear (SchroFrame *frame) +my_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); @@@@ -122,7 +122,7 @@@@ dest_u8 = schro_frame_new_and_alloc (NULL, SCHRO_FRAME_FORMAT_U8_420, video_format.width, video_format.height); - schro_frame_clear(dest); + my_schro_frame_clear(dest); schro_frame_create_pattern(ref,1); motion_vectors = malloc(sizeof(SchroMotionVector) * @ 1.1 log @new package: dirac 1.0.2 (DIRAC Video Codec) @ text @d3 1 a3 1 +++ dirac-1.0.2/Makefile.in 2009-03-14 10:59:06 +0100 d24 3 a26 3 Index: schroedinger-1.0.5/schroedinger.pc.in --- schroedinger-1.0.5/schroedinger.pc.in.orig 2008-07-01 19:26:22 +0200 +++ schroedinger-1.0.5/schroedinger.pc.in 2009-03-14 11:02:03 +0100 d44 4 a47 4 Index: schroedinger-1.0.5/schroedinger/Makefile.in --- schroedinger-1.0.5/schroedinger/Makefile.in.orig 2008-07-01 20:03:42 +0200 +++ schroedinger-1.0.5/schroedinger/Makefile.in 2009-03-14 11:02:20 +0100 @@@@ -153,7 +153,7 @@@@ d56 47 @