Annotation of /trunk/libmpeg3/patches/libmpeg3-1.7-autoconf.patch
Parent Directory | Revision Log
Revision 224 -
(hide annotations)
(download)
Sat Jun 23 13:53:28 2007 UTC (17 years, 3 months ago) by niro
File size: 5627 byte(s)
Sat Jun 23 13:53:28 2007 UTC (17 years, 3 months ago) by niro
File size: 5627 byte(s)
-new fixes
1 | niro | 224 | diff -Naur libmpeg3-1.7/audio/Makefile.am libmpeg3-1.7-autoconf/audio/Makefile.am |
2 | --- libmpeg3-1.7/audio/Makefile.am 1970-01-01 01:00:00.000000000 +0100 | ||
3 | +++ libmpeg3-1.7-autoconf/audio/Makefile.am 2007-06-15 20:38:24.000000000 +0200 | ||
4 | @@ -0,0 +1,12 @@ | ||
5 | +noinst_LTLIBRARIES = libmpeg3_audio.la | ||
6 | +libmpeg3_audio_la_SOURCES = ac3.c dct.c huffman.c layer2.c layer3.c mpeg3audio.c pcm.c synthesizers.c tables.c | ||
7 | +libmpeg3_audio_la_LDFLAGS = | ||
8 | + | ||
9 | +AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) | ||
10 | +AM_CXXFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) | ||
11 | +INCLUDES=-I$(srcdir)/.. | ||
12 | + | ||
13 | +pkgincludedir=$(includedir)/libmpeg3/audio | ||
14 | +pkginclude_HEADERS=ac3.h huffman.h mpeg3audio.h tables.h | ||
15 | +LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) | ||
16 | + | ||
17 | diff -Naur libmpeg3-1.7/AUTHORS libmpeg3-1.7-autoconf/AUTHORS | ||
18 | --- libmpeg3-1.7/AUTHORS 1970-01-01 01:00:00.000000000 +0100 | ||
19 | +++ libmpeg3-1.7-autoconf/AUTHORS 2007-06-15 20:41:05.000000000 +0200 | ||
20 | @@ -0,0 +1 @@ | ||
21 | +AUTHORS | ||
22 | diff -Naur libmpeg3-1.7/ChangeLog libmpeg3-1.7-autoconf/ChangeLog | ||
23 | --- libmpeg3-1.7/ChangeLog 1970-01-01 01:00:00.000000000 +0100 | ||
24 | +++ libmpeg3-1.7-autoconf/ChangeLog 2007-06-15 20:41:14.000000000 +0200 | ||
25 | @@ -0,0 +1 @@ | ||
26 | +ChangeLog | ||
27 | diff -Naur libmpeg3-1.7/configure.ac libmpeg3-1.7-autoconf/configure.ac | ||
28 | --- libmpeg3-1.7/configure.ac 1970-01-01 01:00:00.000000000 +0100 | ||
29 | +++ libmpeg3-1.7-autoconf/configure.ac 2007-06-15 20:38:24.000000000 +0200 | ||
30 | @@ -0,0 +1,62 @@ | ||
31 | +dnl Process this file with autoconf to produce a configure script. | ||
32 | + | ||
33 | +AC_PREREQ(2.59) | ||
34 | + | ||
35 | +AC_INIT([libmpeg3], [1.7], [mail]) | ||
36 | + | ||
37 | + | ||
38 | +AM_INIT_AUTOMAKE(libmpeg3, 1.7) | ||
39 | + | ||
40 | +AC_LANG_C | ||
41 | +AC_PROG_CC | ||
42 | + | ||
43 | + | ||
44 | + | ||
45 | +AC_ENABLE_SHARED | ||
46 | +AC_DISABLE_STATIC | ||
47 | +AC_PROG_LIBTOOL | ||
48 | +AM_PROG_AS | ||
49 | + | ||
50 | + | ||
51 | +enable_mmx=no | ||
52 | + | ||
53 | +AC_ARG_ENABLE(mmx, AC_HELP_STRING([--enable-mmx], [enables support for mmx (default is disabled)]), [ enable_mmx=$enableval ], [ enable_mmx=no ]) | ||
54 | + | ||
55 | +if test "x$enable_mmx" = "xyes"; then | ||
56 | + CPU_CFLAGS="-DHAVE_MMX -DUSE_MMX $CPU_CFLAGS" # -D_MMX_ doesn't work | ||
57 | + have_asm_mmx=true | ||
58 | +fi | ||
59 | + | ||
60 | +AM_CONDITIONAL(USEMMX, test "x$enable_mmx" = "xyes") | ||
61 | + | ||
62 | + | ||
63 | +############## A52DEC | ||
64 | +AC_CHECK_LIB(a52,a52_init,[liba52=yes]) | ||
65 | +AC_CHECK_HEADER(a52dec/a52.h,[liba52h=yes]) | ||
66 | + | ||
67 | +if test "x$liba52$liba52h" = "xyesyes"; then | ||
68 | + A52DEC_CFLAGS= | ||
69 | + A52DEC_LIBS=-la52 | ||
70 | +fi | ||
71 | +AC_SUBST(A52DEC_CFLAGS) | ||
72 | +AC_SUBST(A52DEC_LDFLAGS) | ||
73 | +############## END OF A52DEC | ||
74 | + | ||
75 | +############# CSS SUPPORT IN LIBMPEG3 | ||
76 | +AC_ARG_ENABLE(css, | ||
77 | + AC_HELP_STRING([--disable-css], [disable support for css in libmpeg3 (default=enabled)]),, | ||
78 | + [ enable_css=$enableval ], | ||
79 | + [ enable_css=yes ]) | ||
80 | +if test "x$enable_css" = "xyes"; then | ||
81 | + CSS_CFLAGS="-DHAVE_CSS" | ||
82 | +fi | ||
83 | +AC_SUBST(CSS_CFLAGS) | ||
84 | +############## END OF CSS SUPPORT IN LIBMPEG3 | ||
85 | + | ||
86 | + | ||
87 | +LARGEFILE_CFLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" | ||
88 | +AC_SUBST(LARGEFILE_CFLAGS) | ||
89 | + | ||
90 | + | ||
91 | +AC_CONFIG_FILES([Makefile audio/Makefile video/Makefile]) | ||
92 | +AC_OUTPUT | ||
93 | diff -Naur libmpeg3-1.7/Makefile.am libmpeg3-1.7-autoconf/Makefile.am | ||
94 | --- libmpeg3-1.7/Makefile.am 1970-01-01 01:00:00.000000000 +0100 | ||
95 | +++ libmpeg3-1.7-autoconf/Makefile.am 2007-06-15 20:38:24.000000000 +0200 | ||
96 | @@ -0,0 +1,30 @@ | ||
97 | +SUBDIRS = audio video | ||
98 | + | ||
99 | +lib_LTLIBRARIES = libmpeg3.la | ||
100 | +AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) $(CSS_CFLAGS) | ||
101 | +libmpeg3_la_LDFLAGS = -version-info 1:0:0 -release 1.7.0 -Wl,--no-undefined | ||
102 | +libmpeg3_la_LIBADD = -la52 video/libmpeg3_video.la audio/libmpeg3_audio.la -lm \ | ||
103 | + -lpthread | ||
104 | +libmpeg3_la_SOURCES = bitstream.c libmpeg3.c mpeg3atrack.c mpeg3css.c \ | ||
105 | + mpeg3demux.c \ | ||
106 | + mpeg3ifo.c \ | ||
107 | + mpeg3io.c \ | ||
108 | + mpeg3strack.c \ | ||
109 | + mpeg3title.c \ | ||
110 | + mpeg3tocutil.c \ | ||
111 | + mpeg3vtrack.c workarounds.c | ||
112 | +bin_PROGRAMS = mpeg3dump mpeg3toc mpeg3cat mpeg3peek mpeg3split | ||
113 | +mpeg3dump_SOURCES = mpeg3dump.c | ||
114 | +mpeg3dump_LDADD = libmpeg3.la | ||
115 | +mpeg3toc_SOURCES = mpeg3toc.c | ||
116 | +mpeg3toc_LDADD = libmpeg3.la | ||
117 | +mpeg3cat_SOURCES = mpeg3cat.c | ||
118 | +mpeg3cat_LDADD = libmpeg3.la | ||
119 | +mpeg3peek_SOURCES = mpeg3peek.c | ||
120 | +mpeg3peek_LDADD = libmpeg3.la | ||
121 | +mpeg3split_SOURCES = mpeg3split.c | ||
122 | +mpeg3split_LDADD = libmpeg3.la | ||
123 | + | ||
124 | +pkgincludedir=$(includedir)/libmpeg3 | ||
125 | +pkginclude_HEADERS=libmpeg3.h mpeg3private.h bitstream.h ifo.h mpeg3atrack.h mpeg3css.h mpeg3demux.h mpeg3io.h mpeg3private.inc mpeg3protos.h mpeg3title.h mpeg3vtrack.h timecode.h workarounds.h | ||
126 | +LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) | ||
127 | diff -Naur libmpeg3-1.7/NEWS libmpeg3-1.7-autoconf/NEWS | ||
128 | --- libmpeg3-1.7/NEWS 1970-01-01 01:00:00.000000000 +0100 | ||
129 | +++ libmpeg3-1.7-autoconf/NEWS 2007-06-15 20:40:42.000000000 +0200 | ||
130 | @@ -0,0 +1,2 @@ | ||
131 | +NEWS | ||
132 | + | ||
133 | diff -Naur libmpeg3-1.7/README libmpeg3-1.7-autoconf/README | ||
134 | --- libmpeg3-1.7/README 1970-01-01 01:00:00.000000000 +0100 | ||
135 | +++ libmpeg3-1.7-autoconf/README 2007-06-15 20:40:56.000000000 +0200 | ||
136 | @@ -0,0 +1 @@ | ||
137 | +README | ||
138 | diff -Naur libmpeg3-1.7/video/Makefile.am libmpeg3-1.7-autoconf/video/Makefile.am | ||
139 | --- libmpeg3-1.7/video/Makefile.am 1970-01-01 01:00:00.000000000 +0100 | ||
140 | +++ libmpeg3-1.7-autoconf/video/Makefile.am 2007-06-15 20:38:24.000000000 +0200 | ||
141 | @@ -0,0 +1,28 @@ | ||
142 | +noinst_LTLIBRARIES = libmpeg3_video.la | ||
143 | +libmpeg3_video_la_SOURCES = getpicture.c \ | ||
144 | + headers.c \ | ||
145 | + idct.c \ | ||
146 | + macroblocks.c \ | ||
147 | + mmxtest.c \ | ||
148 | + motion.c \ | ||
149 | + mpeg3cache.c \ | ||
150 | + mpeg3video.c \ | ||
151 | + output.c \ | ||
152 | + reconstruct.c \ | ||
153 | + seek.c \ | ||
154 | + slice.c \ | ||
155 | + subtitle.c \ | ||
156 | + vlc.c | ||
157 | +libmpeg3_video_la_LDFLAGS= | ||
158 | + | ||
159 | +if USEMMX | ||
160 | +libmpeg3_video_la_SOURCES += mmxidct.S reconmmx.s | ||
161 | +endif | ||
162 | + | ||
163 | +AM_CFLAGS = $(CPU_CFLAGS) $(LARGEFILE_CFLAGS) | ||
164 | +INCLUDES=-I$(srcdir)/.. | ||
165 | + | ||
166 | +pkgincludedir=$(includedir)/libmpeg3/video | ||
167 | +pkginclude_HEADERS=idct.h layerdata.h mpeg3video.h mpeg3videoprotos.h slice.h vlc.h | ||
168 | + | ||
169 | +LIBTOOL = $(SHELL) $(top_builddir)/libtool $(LTC_FLAGS) |