[xiph-commits] r14081 - trunk/theora/lib
giles at svn.xiph.org
giles at svn.xiph.org
Wed Oct 31 16:23:21 PDT 2007
Author: giles
Date: 2007-10-31 16:23:21 -0700 (Wed, 31 Oct 2007)
New Revision: 14081
Added:
trunk/theora/lib/Version_script-dec
trunk/theora/lib/Version_script-enc
Modified:
trunk/theora/lib/Makefile.am
trunk/theora/lib/Version_script
Log:
Build libtheoradec and libtheoraenc, which export the theora-exp
API as well as the corresponding portion of the old api. Not especially
tested.
Modified: trunk/theora/lib/Makefile.am
===================================================================
--- trunk/theora/lib/Makefile.am 2007-10-31 21:59:55 UTC (rev 14080)
+++ trunk/theora/lib/Makefile.am 2007-10-31 23:23:21 UTC (rev 14081)
@@ -1,4 +1,6 @@
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/lib/dec -I$(top_srcdir)/lib/enc
+AM_CFLAGS = $(OGG_CFLAGS)
+LIBADD = $(OGG_LIBS)
EXTRA_DIST = \
enc/x86_32/dct_decode_mmx.c \
@@ -19,7 +21,7 @@
enc/encode.c \
enc/encoder_toplevel.c
-lib_LTLIBRARIES = libtheora.la
+lib_LTLIBRARIES = libtheoradec.la libtheoraenc.la libtheora.la
if THEORA_DISABLE_ENCODE
encoder_sources = \
@@ -122,18 +124,35 @@
dec/quant.h \
dec/x86/x86int.h
+libtheoradec_la_SOURCES = \
+ cpu.c \
+ $(decoder_arch_sources) \
+ $(decoder_sources) \
+ Version_script-dec
+libtheoradec_la_LDFLAGS = \
+ -version-info @THDEC_LIB_CURRENT@:@THDEC_LIB_REVISION@:@THDEC_LIB_AGE@ \
+ @THEORADEC_LDFLAGS@
+
+libtheoraenc_la_SOURCES = \
+ cpu.c \
+ $(encoder_arch_sources) \
+ $(encoder_sources) \
+ Version_script-enc
+libtheoraenc_la_LDFLAGS = \
+ -version-info @THENC_LIB_CURRENT@:@THENC_LIB_REVISION@:@THENC_LIB_AGE@ \
+ @THEORAENC_LDFLAGS@
+
libtheora_la_SOURCES = \
cpu.c \
$(decoder_arch_sources) \
$(decoder_sources) \
$(encoder_arch_sources) \
$(encoder_sources) \
- Version_script
+ Version_script-old
+libtheora_la_LDFLAGS = \
+ -version-info @TH_LIB_CURRENT@:@TH_LIB_REVISION@:@TH_LIB_AGE@ \
+ @THEORA_LDFLAGS@
-libtheora_la_CFLAGS = $(OGG_CFLAGS)
-libtheora_la_LDFLAGS = -version-info @TH_LIB_CURRENT@:@TH_LIB_REVISION@:@TH_LIB_AGE@ @THEORA_LDFLAGS@
-libtheora_la_LIBADD = $(OGG_LIBS)
-
debug:
$(MAKE) all CFLAGS="@DEBUG@"
Modified: trunk/theora/lib/Version_script
===================================================================
--- trunk/theora/lib/Version_script 2007-10-31 21:59:55 UTC (rev 14080)
+++ trunk/theora/lib/Version_script 2007-10-31 23:23:21 UTC (rev 14081)
@@ -6,7 +6,7 @@
#
# We use something that looks like an versioned so filename here
-# to define the 1.0 API because of a historical confusion. This
+# to define the old API because of a historical confusion. This
# label must be kept to maintain ABI compatibility.
libtheora.so.1.0
Copied: trunk/theora/lib/Version_script-dec (from rev 14075, trunk/theora/lib/Version_script)
===================================================================
--- trunk/theora/lib/Version_script-dec (rev 0)
+++ trunk/theora/lib/Version_script-dec 2007-10-31 23:23:21 UTC (rev 14081)
@@ -0,0 +1,82 @@
+#
+# Export file for libtheoradec
+#
+# Only the symbols listed in the global section will be callable from
+# applications linking to the libraries.
+#
+
+# The 1.x API
+libtheoradec_1.0
+{
+ global:
+ th_version_string;
+ th_version_number;
+
+ th_decode_headerin;
+ th_decode_alloc;
+ th_setup_free;
+ th_decode_ctl;
+ th_decode_packetin;
+ th_decode_ycbcr_out;
+ th_decode_free;
+
+ th_packet_isheader;
+ th_packet_iskeyframe;
+
+ th_granule_frame;
+ th_granule_time;
+
+ th_info_init;
+ th_info_clear;
+
+ th_comment_init;
+ th_comment_add;
+ th_comment_add_tag;
+ th_comment_query;
+ th_comment_query_count;
+ th_comment_clear;
+
+ local:
+ *;
+};
+
+# The deprecated legacy api from the libtheora alpha releases.
+# We use something that looks like an versioned so filename here
+# to define the old API because of a historical confusion. This
+# label must be kept to maintain ABI compatibility.
+
+libtheora.so.1.0
+{
+ global:
+ theora_version_string;
+ theora_version_number;
+
+ theora_decode_header;
+ theora_decode_init;
+ theora_decode_packetin;
+ theora_decode_YUVout;
+
+ theora_control;
+
+ theora_packet_isheader;
+ theora_packet_iskeyframe;
+
+ theora_granule_shift;
+ theora_granule_frame;
+ theora_granule_time;
+
+ theora_info_init;
+ theora_info_clear;
+
+ theora_clear;
+
+ theora_comment_init;
+ theora_comment_add;
+ theora_comment_add_tag;
+ theora_comment_query;
+ theora_comment_query_count;
+ theora_comment_clear;
+
+ local:
+ *;
+};
Copied: trunk/theora/lib/Version_script-enc (from rev 14075, trunk/theora/lib/Version_script)
===================================================================
--- trunk/theora/lib/Version_script-enc (rev 0)
+++ trunk/theora/lib/Version_script-enc 2007-10-31 23:23:21 UTC (rev 14081)
@@ -0,0 +1,43 @@
+#
+# Export file for libtheora
+#
+# Only the symbols listed in the global section will be callable from
+# applications linking to the libraries.
+#
+
+# The 1.x encoder API
+libtheoraenc_1.0
+{
+ global:
+ th_encode_alloc;
+ th_encode_ctl;
+ th_encode_flushheader;
+ th_encode_ycbcr_in;
+ th_encode_packetout;
+ th_encode_free;
+
+ TH_VP31_QUANT_INFO;
+ TH_VP31_HUFF_CODES;
+
+ local:
+ *;
+};
+
+# The encoder portion of the deprecated alpha release api.
+# We use something that looks like an versioned so filename here
+# to define the old API because of a historical confusion. This
+# label must be kept to maintain ABI compatibility.
+
+libtheora.so.1.0
+{
+ global:
+ theora_encode_init;
+ theora_encode_YUVin;
+ theora_encode_packetout;
+ theora_encode_header;
+ theora_encode_comment;
+ theora_encode_tables;
+
+ local:
+ *;
+};
More information about the commits
mailing list