[packages/libmpeg3.git] / libmpeg3-shared.patch

diff -ur libmpeg3-1.2.2/Makefile libmpeg3-1.2.2.shared/Makefile
--- libmpeg3-1.2.2/Makefile	Fri Nov 10 21:03:01 2000
+++ libmpeg3-1.2.2.shared/Makefile	Sun Nov 19 00:56:07 2000
@@ -2,6 +2,11 @@
 CFLAGS += -g
 export CFLAGS
 
+MAJOR = 1
+MINOR = 2
+MICRO = 3
+CFLAGSSHARE = -shared -Wl,-soname,libmpeg3.so.$(MAJOR)
+
 OBJS = \
 	bitstream.o \
 	libmpeg3.o \
@@ -14,6 +19,18 @@
 	mpeg3toc2.o \
 	mpeg3vtrack.o
 
+OBJS_SHARED = \
+	bitstream_pic.o \
+	libmpeg3_pic.o \
+	mpeg3atrack_pic.o \
+	mpeg3css_pic.o \
+	mpeg3demux_pic.o \
+	mpeg3ifo_pic.o \
+	mpeg3io_pic.o \
+	mpeg3title_pic.o \
+	mpeg3toc2_pic.o \
+	mpeg3vtrack_pic.o
+
 AUDIOOBJS = \
 	audio/ac3.o \
 	audio/bit_allocation.o \
@@ -28,6 +45,20 @@
 	audio/synthesizers.o \
 	audio/tables.o
 
+AUDIOOBJS_SHARED = \
+	audio/ac3_pic.o \
+	audio/bit_allocation_pic.o \
+	audio/dct_pic.o \
+	audio/exponents_pic.o \
+	audio/header_pic.o \
+	audio/layer2_pic.o \
+	audio/layer3_pic.o \
+	audio/mantissa_pic.o \
+	audio/mpeg3audio_pic.o \
+	audio/pcm_pic.o \
+	audio/synthesizers_pic.o \
+	audio/tables_pic.o
+
 VIDEOOBJS = \
 	video/getpicture.o \
 	video/headers.o \
@@ -42,38 +73,62 @@
 	video/slice.o \
 	video/vlc.o
 
+VIDEOOBJS_SHARED = \
+	video/getpicture_pic.o \
+	video/headers_pic.o \
+	video/idct_pic.o \
+	video/macroblocks_pic.o \
+	video/mmxtest_pic.o \
+	video/motion_pic.o \
+	video/mpeg3video_pic.o \
+	video/output_pic.o \
+	video/reconstruct_pic.o \
+	video/seek_pic.o \
+	video/slice_pic.o \
+	video/vlc_pic.o
+
 OUTPUT = libmpeg3.a
+OUTPUT_SHARED = libmpeg3.so.$(MAJOR).$(MINOR).$(MICRO)
 UTILS = dump mpeg3cat mpeg3toc mpeg3split
 LIBS = -lm -lpthread
 
-all: $(OUTPUT) util
+all: $(OUTPUT) $(OUTPUT_SHARED) util
 
 $(OUTPUT): $(OBJS)
 	$(MAKE) -C audio
 	$(MAKE) -C video
 	ar rcs $(OUTPUT) $(OBJS) $(MMXOBJS) $(VIDEOOBJS) $(AUDIOOBJS) $(IFOOBJS)
 
-dump: dump.o $(OUTPUT)
-	$(CC) -o dump dump.o $(OUTPUT) $(LIBS)
+$(OUTPUT_SHARED): $(OBJS_SHARED)
+	$(MAKE) -C audio
+	$(MAKE) -C video
+	$(CC) $(CFLAGSSHARE) -o $(OUTPUT_SHARED) $(MMXOBJS_SHARED) $(VIDEOOBJS_SHARED) $(AUDIOOBJS_SHARED) $(IFOOBJS_SHARED) $(OBJS_SHARED)
+	ln -sf $(OUTPUT_SHARED) libmpeg3.so
 
-mpeg3cat: mpeg3cat.o $(OUTPUT)
-	$(CC) -o mpeg3cat mpeg3cat.o $(OUTPUT) $(LIBS)
+dump: dump.o $(OUTPUT_SHARED)
+	$(CC) -o dump dump.o -L. -lmpeg3 $(LIBS)
 
-mpeg3toc: mpeg3toc.o $(OUTPUT)
-	$(CC) -o mpeg3toc mpeg3toc.o $(OUTPUT) $(LIBS)
+mpeg3cat: mpeg3cat.o $(OUTPUT_SHARED)
+	$(CC) -o mpeg3cat mpeg3cat.o -L. -lmpeg3 $(LIBS)
 
-mpeg3split: mpeg3split.o $(OUTPUT)
-	$(CC) -o mpeg3split mpeg3split.o $(OUTPUT) $(LIBS)
+mpeg3toc: mpeg3toc.o $(OUTPUT_SHARED)
+	$(CC) -o mpeg3toc mpeg3toc.o -L. -lmpeg3 $(LIBS)
+
+mpeg3split: mpeg3split.o $(OUTPUT_SHARED)
+	$(CC) -o mpeg3split mpeg3split.o -L. -lmpeg3 $(LIBS)
 
 util: $(UTILS)
 
 .c.o:
-	$(CC) -c `./c_flags` $*.c
+	$(CC) -c $(CFLAGS) $*.c
+
+%_pic.o: %.c
+	$(CC) -fPIC $(CFLAGS) -c $< -o $@
 
 clean:
 	make -C audio clean
 	make -C video clean
-	rm -f core *.o $(OUTPUT)
+	rm -f core *.o *.so* $(OUTPUT)
 	rm -f $(UTILS)
 
 backup: clean
diff -ur libmpeg3-1.2.2/audio/Makefile libmpeg3-1.2.2.shared/audio/Makefile
--- libmpeg3-1.2.2/audio/Makefile	Fri Nov 10 21:03:01 2000
+++ libmpeg3-1.2.2.shared/audio/Makefile	Sun Nov 19 00:17:35 2000
@@ -15,10 +15,27 @@
 	synthesizers.o \
 	tables.o
 
-all: $(OBJS)
+OBJS_SHARED = \
+	ac3_pic.o \
+	bit_allocation_pic.o \
+	dct_pic.o \
+	exponents_pic.o \
+	header_pic.o \
+	layer2_pic.o \
+	layer3_pic.o \
+	mantissa_pic.o \
+	mpeg3audio_pic.o \
+	pcm_pic.o \
+	synthesizers_pic.o \
+	tables_pic.o
+
+all: $(OBJS) $(OBJS_SHARED)
 
 .c.o:
-	$(CC) -c `./c_flags` $*.c
+	$(CC) -c $(CFLAGS) $*.c
+
+%_pic.o: %.c
+	$(CC) -fPIC $(CFLAGS) -c $< -o $@
 
 .s.o:
 	$(CC) -f elf $*.s
diff -ur libmpeg3-1.2.2/configure libmpeg3-1.2.2.shared/configure
--- libmpeg3-1.2.2/configure	Fri Nov 10 21:03:01 2000
+++ libmpeg3-1.2.2.shared/configure	Sun Nov 19 00:24:34 2000
@@ -60,6 +60,12 @@
 MMXOBJS2 = \
 	mmxidct.o \
 	reconmmx.o
+MMXOBJS_SHARED = \
+	video/mmxidct_pic.o \
+	video/reconmmx_pic.o
+MMXOBJS2_SHARED = \
+	mmxidct_pic.o \
+	reconmmx_pic.o
 EOF
 fi
 
diff -ur libmpeg3-1.2.2/global_config libmpeg3-1.2.2.shared/global_config
--- libmpeg3-1.2.2/global_config	Fri Nov 10 21:03:01 2000
+++ libmpeg3-1.2.2.shared/global_config	Sun Nov 19 00:52:22 2000
@@ -1,7 +1,10 @@
 # DO NOT EDIT.  EDIT ./configure INSTEAD AND RERUN IT.
+CFLAGS = -O2 -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486 -I/usr/local/include
 CC = gcc
 NASM = nasm
 CFLAGS += -DHAVE_CSS
 CFLAGS += -DHAVE_MMX
 MMXOBJS = 	video/mmxidct.o 	video/reconmmx.o
 MMXOBJS2 = 	mmxidct.o 	reconmmx.o
+MMXOBJS_SHARED = 	video/mmxidct_pic.o 	video/reconmmx_pic.o
+MMXOBJS2_SHARED = 	mmxidct_pic.o 	reconmmx_pic.o
diff -ur libmpeg3-1.2.2/video/Makefile libmpeg3-1.2.2.shared/video/Makefile
--- libmpeg3-1.2.2/video/Makefile	Fri Nov 10 21:03:01 2000
+++ libmpeg3-1.2.2.shared/video/Makefile	Sun Nov 19 00:49:47 2000
@@ -15,17 +15,40 @@
 	slice.o \
 	vlc.o
 
+OBJS_SHARED = \
+	getpicture_pic.o \
+	headers_pic.o \
+	idct_pic.o \
+	macroblocks_pic.o \
+	mmxtest_pic.o \
+	motion_pic.o \
+	mpeg3video_pic.o \
+	output_pic.o \
+	reconstruct_pic.o \
+	seek_pic.o \
+	slice_pic.o \
+	vlc_pic.o
 
-all: $(OBJS) $(MMXOBJS2)
+
+all: $(OBJS) $(MMXOBJS2) $(OBJS_SHARED) $(MMXOBJS2_SHARED)
 
 .c.o:
-	$(CC) -c `./c_flags` $*.c
+	$(CC) -c $(CFLAGS) $*.c
+
+%_pic.o: %.c
+	$(CC) -fPIC $(CFLAGS) -c $< -o $@
 
 .s.o:
 	$(NASM) -f elf $*.s
 
+%_pic.o: %.s
+	$(NASM) -f elf $< -o $@
+
 .S.o:
-	$(CC) -c `./c_flags` $*.S
+	$(CC) -c $(CFLAGS) $*.S
+
+%_pic.o: %.S
+	$(CC) -fPIC $(CFLAGS) -c $< -o $@
 
 clean:
 	rm -f *.o 
diff -ur libmpeg3-1.2.2/video/slice.c libmpeg3-1.2.2.shared/video/slice.c
--- libmpeg3-1.2.2/video/slice.c	Fri Nov 10 21:03:01 2000
+++ libmpeg3-1.2.2.shared/video/slice.c	Sun Nov 19 00:45:25 2000
@@ -228,7 +228,7 @@
             	"movq        %%mm0,         (%%eax)\n"
             	"movq        %%mm0,         (%%eax, %1)\n"
             	:
-            	: "D" (rfp), "c" (iincr), "b" (bp)
+            	: "D" (rfp), "c" (iincr), "r" (bp)
             	: "eax");
     		}
     		else
Commit	Line	Data
988f053b JR	1	diff -ur libmpeg3-1.2.2/Makefile libmpeg3-1.2.2.shared/Makefile
	2	--- libmpeg3-1.2.2/Makefile Fri Nov 10 21:03:01 2000
	3	+++ libmpeg3-1.2.2.shared/Makefile Sun Nov 19 00:56:07 2000
	4	@@ -2,6 +2,11 @@
	5	CFLAGS += -g
	6	export CFLAGS
	7
	8	+MAJOR = 1
	9	+MINOR = 2
7736d010	10	+MICRO = 3
988f053b JR	11	+CFLAGSSHARE = -shared -Wl,-soname,libmpeg3.so.$(MAJOR)
	12	+
	13	OBJS = \
	14	bitstream.o \
	15	libmpeg3.o \
	16	@@ -14,6 +19,18 @@
	17	mpeg3toc2.o \
	18	mpeg3vtrack.o
	19
	20	+OBJS_SHARED = \
	21	+ bitstream_pic.o \
	22	+ libmpeg3_pic.o \
	23	+ mpeg3atrack_pic.o \
	24	+ mpeg3css_pic.o \
	25	+ mpeg3demux_pic.o \
	26	+ mpeg3ifo_pic.o \
	27	+ mpeg3io_pic.o \
	28	+ mpeg3title_pic.o \
	29	+ mpeg3toc2_pic.o \
	30	+ mpeg3vtrack_pic.o
	31	+
	32	AUDIOOBJS = \
	33	audio/ac3.o \
	34	audio/bit_allocation.o \
	35	@@ -28,6 +45,20 @@
	36	audio/synthesizers.o \
	37	audio/tables.o
	38
	39	+AUDIOOBJS_SHARED = \
	40	+ audio/ac3_pic.o \
	41	+ audio/bit_allocation_pic.o \
	42	+ audio/dct_pic.o \
	43	+ audio/exponents_pic.o \
	44	+ audio/header_pic.o \
	45	+ audio/layer2_pic.o \
	46	+ audio/layer3_pic.o \
	47	+ audio/mantissa_pic.o \
	48	+ audio/mpeg3audio_pic.o \
	49	+ audio/pcm_pic.o \
	50	+ audio/synthesizers_pic.o \
	51	+ audio/tables_pic.o
	52	+
	53	VIDEOOBJS = \
	54	video/getpicture.o \
	55	video/headers.o \
	56	@@ -42,38 +73,62 @@
	57	video/slice.o \
	58	video/vlc.o
	59
	60	+VIDEOOBJS_SHARED = \
	61	+ video/getpicture_pic.o \
	62	+ video/headers_pic.o \
	63	+ video/idct_pic.o \
	64	+ video/macroblocks_pic.o \
	65	+ video/mmxtest_pic.o \
	66	+ video/motion_pic.o \
	67	+ video/mpeg3video_pic.o \
	68	+ video/output_pic.o \
	69	+ video/reconstruct_pic.o \
	70	+ video/seek_pic.o \
	71	+ video/slice_pic.o \
	72	+ video/vlc_pic.o
	73	+
	74	OUTPUT = libmpeg3.a
7736d010	75	+OUTPUT_SHARED = libmpeg3.so.$(MAJOR).$(MINOR).$(MICRO)
988f053b JR	76	UTILS = dump mpeg3cat mpeg3toc mpeg3split
	77	LIBS = -lm -lpthread
	78
	79	-all: $(OUTPUT) util
	80	+all: $(OUTPUT) $(OUTPUT_SHARED) util
	81
	82	$(OUTPUT): $(OBJS)
	83	$(MAKE) -C audio
	84	$(MAKE) -C video
	85	ar rcs $(OUTPUT) $(OBJS) $(MMXOBJS) $(VIDEOOBJS) $(AUDIOOBJS) $(IFOOBJS)
	86
	87	-dump: dump.o $(OUTPUT)
	88	- $(CC) -o dump dump.o $(OUTPUT) $(LIBS)
	89	+$(OUTPUT_SHARED): $(OBJS_SHARED)
	90	+ $(MAKE) -C audio
	91	+ $(MAKE) -C video
	92	+ $(CC) $(CFLAGSSHARE) -o $(OUTPUT_SHARED) $(MMXOBJS_SHARED) $(VIDEOOBJS_SHARED) $(AUDIOOBJS_SHARED) $(IFOOBJS_SHARED) $(OBJS_SHARED)
	93	+ ln -sf $(OUTPUT_SHARED) libmpeg3.so
	94
	95	-mpeg3cat: mpeg3cat.o $(OUTPUT)
	96	- $(CC) -o mpeg3cat mpeg3cat.o $(OUTPUT) $(LIBS)
	97	+dump: dump.o $(OUTPUT_SHARED)
	98	+ $(CC) -o dump dump.o -L. -lmpeg3 $(LIBS)
	99
	100	-mpeg3toc: mpeg3toc.o $(OUTPUT)
	101	- $(CC) -o mpeg3toc mpeg3toc.o $(OUTPUT) $(LIBS)
	102	+mpeg3cat: mpeg3cat.o $(OUTPUT_SHARED)
	103	+ $(CC) -o mpeg3cat mpeg3cat.o -L. -lmpeg3 $(LIBS)
	104
	105	-mpeg3split: mpeg3split.o $(OUTPUT)
	106	- $(CC) -o mpeg3split mpeg3split.o $(OUTPUT) $(LIBS)
	107	+mpeg3toc: mpeg3toc.o $(OUTPUT_SHARED)
	108	+ $(CC) -o mpeg3toc mpeg3toc.o -L. -lmpeg3 $(LIBS)
	109	+
	110	+mpeg3split: mpeg3split.o $(OUTPUT_SHARED)
	111	+ $(CC) -o mpeg3split mpeg3split.o -L. -lmpeg3 $(LIBS)
	112
	113	util: $(UTILS)
	114
	115	.c.o:
	116	- $(CC) -c `./c_flags` $*.c
	117	+ $(CC) -c $(CFLAGS) $*.c
	118	+
	119	+%_pic.o: %.c
	120	+ $(CC) -fPIC $(CFLAGS) -c $< -o $@
	121
	122	clean:
	123	make -C audio clean
	124	make -C video clean
	125	- rm -f core *.o $(OUTPUT)
	126	+ rm -f core .o .so* $(OUTPUT)
	127	rm -f $(UTILS)
	128
	129	backup: clean
	130	diff -ur libmpeg3-1.2.2/audio/Makefile libmpeg3-1.2.2.shared/audio/Makefile
	131	--- libmpeg3-1.2.2/audio/Makefile Fri Nov 10 21:03:01 2000
	132	+++ libmpeg3-1.2.2.shared/audio/Makefile Sun Nov 19 00:17:35 2000
	133	@@ -15,10 +15,27 @@
	134	synthesizers.o \
	135	tables.o
	136
	137	-all: $(OBJS)
	138	+OBJS_SHARED = \
	139	+ ac3_pic.o \
140	+ bit_allocation_pic.o \
141	+ dct_pic.o \
142	+ exponents_pic.o \
143	+ header_pic.o \
144	+ layer2_pic.o \
145	+ layer3_pic.o \
146	+ mantissa_pic.o \
147	+ mpeg3audio_pic.o \
148	+ pcm_pic.o \
149	+ synthesizers_pic.o \
150	+ tables_pic.o
151	+
152	+all: $(OBJS) $(OBJS_SHARED)
153
154	.c.o:
155	- $(CC) -c `./c_flags` $*.c
156	+ $(CC) -c $(CFLAGS) $*.c
157	+
158	+%_pic.o: %.c
159	+ $(CC) -fPIC $(CFLAGS) -c $< -o $@
160
161	.s.o:
162	$(CC) -f elf $*.s
163	diff -ur libmpeg3-1.2.2/configure libmpeg3-1.2.2.shared/configure
164	--- libmpeg3-1.2.2/configure Fri Nov 10 21:03:01 2000
165	+++ libmpeg3-1.2.2.shared/configure Sun Nov 19 00:24:34 2000
166	@@ -60,6 +60,12 @@
167	MMXOBJS2 = \
168	mmxidct.o \
169	reconmmx.o
170	+MMXOBJS_SHARED = \
171	+ video/mmxidct_pic.o \
172	+ video/reconmmx_pic.o
173	+MMXOBJS2_SHARED = \
174	+ mmxidct_pic.o \
175	+ reconmmx_pic.o
176	EOF
177	fi
178
179	diff -ur libmpeg3-1.2.2/global_config libmpeg3-1.2.2.shared/global_config
180	--- libmpeg3-1.2.2/global_config Fri Nov 10 21:03:01 2000
181	+++ libmpeg3-1.2.2.shared/global_config Sun Nov 19 00:52:22 2000
182	@@ -1,7 +1,10 @@
183	# DO NOT EDIT. EDIT ./configure INSTEAD AND RERUN IT.
184	+CFLAGS = -O2 -funroll-loops -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -march=i486 -I/usr/local/include
185	CC = gcc
186	NASM = nasm
187	CFLAGS += -DHAVE_CSS
188	CFLAGS += -DHAVE_MMX
189	MMXOBJS = video/mmxidct.o video/reconmmx.o
190	MMXOBJS2 = mmxidct.o reconmmx.o
191	+MMXOBJS_SHARED = video/mmxidct_pic.o video/reconmmx_pic.o
192	+MMXOBJS2_SHARED = mmxidct_pic.o reconmmx_pic.o
193	diff -ur libmpeg3-1.2.2/video/Makefile libmpeg3-1.2.2.shared/video/Makefile
194	--- libmpeg3-1.2.2/video/Makefile Fri Nov 10 21:03:01 2000
195	+++ libmpeg3-1.2.2.shared/video/Makefile Sun Nov 19 00:49:47 2000
196	@@ -15,17 +15,40 @@
197	slice.o \
198	vlc.o
199
200	+OBJS_SHARED = \
201	+ getpicture_pic.o \
202	+ headers_pic.o \
203	+ idct_pic.o \
204	+ macroblocks_pic.o \
205	+ mmxtest_pic.o \
206	+ motion_pic.o \
207	+ mpeg3video_pic.o \
208	+ output_pic.o \
209	+ reconstruct_pic.o \
210	+ seek_pic.o \
211	+ slice_pic.o \
212	+ vlc_pic.o
213
214	-all: $(OBJS) $(MMXOBJS2)
215	+
216	+all: $(OBJS) $(MMXOBJS2) $(OBJS_SHARED) $(MMXOBJS2_SHARED)
217
218	.c.o:
219	- $(CC) -c `./c_flags` $*.c
220	+ $(CC) -c $(CFLAGS) $*.c
221	+
222	+%_pic.o: %.c
223	+ $(CC) -fPIC $(CFLAGS) -c $< -o $@
224
225	.s.o:
226	$(NASM) -f elf $*.s
227
228	+%_pic.o: %.s
229	+ $(NASM) -f elf $< -o $@
230	+
231	.S.o:
232	- $(CC) -c `./c_flags` $*.S
233	+ $(CC) -c $(CFLAGS) $*.S
234	+
235	+%_pic.o: %.S
236	+ $(CC) -fPIC $(CFLAGS) -c $< -o $@
237
238	clean:
239	rm -f *.o
240	diff -ur libmpeg3-1.2.2/video/slice.c libmpeg3-1.2.2.shared/video/slice.c
241	--- libmpeg3-1.2.2/video/slice.c Fri Nov 10 21:03:01 2000
242	+++ libmpeg3-1.2.2.shared/video/slice.c Sun Nov 19 00:45:25 2000
243	@@ -228,7 +228,7 @@
244	"movq %%mm0, (%%eax)\n"
245	"movq %%mm0, (%%eax, %1)\n"
246	:
247	- : "D" (rfp), "c" (iincr), "b" (bp)
248	+ : "D" (rfp), "c" (iincr), "r" (bp)
249	: "eax");
250	}
251	else