[xiph-commits] r12604 - in trunk/theora-exp: . lib

[j at svn.xiph.org]

Author: j
Date: 2007-03-02 05:08:06 -0800 (Fri, 02 Mar 2007)
New Revision: 12604

Added:
   trunk/theora-exp/theoracompat.pc.in
Modified:
   trunk/theora-exp/Makefile.am
   trunk/theora-exp/configure.ac
   trunk/theora-exp/lib/Makefile.am
   trunk/theora-exp/lib/apiwrapper.c
Log:
split the api compat layer into its own library so its possible to
use the new theora decoder and the encoder from the reference encoder
at the same time.



Modified: trunk/theora-exp/Makefile.am
===================================================================
--- trunk/theora-exp/Makefile.am	2007-03-02 12:52:10 UTC (rev 12603)
+++ trunk/theora-exp/Makefile.am	2007-03-02 13:08:06 UTC (rev 12604)
@@ -12,7 +12,7 @@
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(TH_ENCODER_FILES) theoradec.pc
+pkgconfig_DATA = $(TH_ENCODER_FILES) theoradec.pc theoracompat.pc
 
 dist-hook:
 	rm -rf `find $(distdir)/doc -name .svn`

Modified: trunk/theora-exp/configure.ac
===================================================================
--- trunk/theora-exp/configure.ac	2007-03-02 12:52:10 UTC (rev 12603)
+++ trunk/theora-exp/configure.ac	2007-03-02 13:08:06 UTC (rev 12604)
@@ -175,6 +175,7 @@
   examples/Makefile
   theoradec.pc
   theoraenc.pc
+  theoracompat.pc
 ])
 
 AS_AC_EXPAND(LIBDIR, ${libdir})

Modified: trunk/theora-exp/lib/Makefile.am
===================================================================
--- trunk/theora-exp/lib/Makefile.am	2007-03-02 12:52:10 UTC (rev 12603)
+++ trunk/theora-exp/lib/Makefile.am	2007-03-02 13:08:06 UTC (rev 12604)
@@ -4,7 +4,7 @@
 ENCODER_LA=
 endif
 
-lib_LTLIBRARIES = libtheoradec.la $(ENCODER_LA)
+lib_LTLIBRARIES = libtheoradec.la libtheoracompat.la $(ENCODER_LA)
 
 INCLUDES = -I $(top_srcdir)/include
 AM_CFLAGS = $(OGG_CFLAGS) $(OPTIMIZATION_CFLAGS)
@@ -44,8 +44,10 @@
 	x86/cpu.h \
 	x86/x86int.h
 
+libtheoracompat_la_SOURCES = \
+	apiwrapper.c
+
 libtheoradec_la_SOURCES = \
-	apiwrapper.c \
 	decinfo.c \
 	decode.c \
 	dequant.c \

Modified: trunk/theora-exp/lib/apiwrapper.c
===================================================================
--- trunk/theora-exp/lib/apiwrapper.c	2007-03-02 12:52:10 UTC (rev 12603)
+++ trunk/theora-exp/lib/apiwrapper.c	2007-03-02 13:08:06 UTC (rev 12604)
@@ -2,8 +2,7 @@
 #include <string.h>
 #include <limits.h>
 #include <ogg/ogg.h>
-/*libtheora header.
-  TODO: We should provide our own copy.*/
+/*libtheora header.*/
 #include <theora/theora.h>
 /*theora-exp header.*/
 #include "theora/theoradec.h"

Copied: trunk/theora-exp/theoracompat.pc.in (from rev 12601, trunk/theora-exp/theoradec.pc.in)
===================================================================
--- trunk/theora-exp/theoradec.pc.in	2007-03-02 11:15:10 UTC (rev 12601)
+++ trunk/theora-exp/theoracompat.pc.in	2007-03-02 13:08:06 UTC (rev 12604)
@@ -0,0 +1,14 @@
+# theora installed pkg-config file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: theoracompat
+Description: Theora video codec
+Version: @VERSION@
+Requires: ogg >= 1.1.1 theoradec
+Conflicts:
+Libs: -L${libdir} -ltheoracompat
+Cflags: -I${includedir}