]>
Commit | Line | Data |
---|---|---|
a6c7fa1d JB |
1 | diff -Nur libmpeg3.orig/Makefile libmpeg3/Makefile |
2 | --- libmpeg3.orig/Makefile Sat Apr 6 00:16:49 2002 | |
3 | +++ libmpeg3/Makefile Sat Apr 6 00:45:24 2002 | |
4 | @@ -65,6 +65,7 @@ | |
5 | ifeq ($(USE_MMX), 1) | |
6 | CFLAGS += -DHAVE_MMX | |
7 | ASMOBJS = $(OBJDIR)/video/mmxidct.o | |
8 | + SHAREDASMOBJS = $(OBJDIR)/video/mmxidct_pic.o | |
9 | NASMOBJS = $(OBJDIR)/video/reconmmx.o | |
10 | endif | |
988f053b | 11 | |
a6c7fa1d JB |
12 | @@ -81,7 +82,10 @@ |
13 | ||
14 | ||
15 | ||
16 | - | |
988f053b | 17 | +MAJOR = 1 |
a6c7fa1d JB |
18 | +MINOR = 5 |
19 | +MICRO = 0 | |
20 | +LDFLAGSSHARE = -shared -Wl,-soname,libmpeg3.so.$(MAJOR) | |
21 | ||
22 | UTILOBJS = \ | |
23 | $(OBJDIR)/mpeg3cat.o \ | |
24 | @@ -126,8 +130,44 @@ | |
25 | $(OBJDIR)/video/vlc.o \ | |
26 | $(OBJDIR)/workarounds.o | |
27 | ||
28 | +SHAREDOBJS = \ | |
29 | + $(OBJDIR)/bitstream_pic.o \ | |
30 | + $(OBJDIR)/libmpeg3_pic.o \ | |
31 | + $(OBJDIR)/mpeg3atrack_pic.o \ | |
32 | + $(OBJDIR)/mpeg3css_pic.o \ | |
33 | + $(OBJDIR)/mpeg3demux_pic.o \ | |
34 | + $(OBJDIR)/mpeg3ifo_pic.o \ | |
35 | + $(OBJDIR)/mpeg3io_pic.o \ | |
36 | + $(OBJDIR)/mpeg3title_pic.o \ | |
37 | + $(OBJDIR)/mpeg3vtrack_pic.o \ | |
38 | + $(OBJDIR)/audio/ac3_pic.o \ | |
39 | + $(OBJDIR)/audio/bit_allocation_pic.o \ | |
40 | + $(OBJDIR)/audio/dct_pic.o \ | |
41 | + $(OBJDIR)/audio/exponents_pic.o \ | |
42 | + $(OBJDIR)/audio/header_pic.o \ | |
43 | + $(OBJDIR)/audio/layer2_pic.o \ | |
44 | + $(OBJDIR)/audio/layer3_pic.o \ | |
45 | + $(OBJDIR)/audio/mantissa_pic.o \ | |
46 | + $(OBJDIR)/audio/mpeg3audio_pic.o \ | |
47 | + $(OBJDIR)/audio/pcm_pic.o \ | |
48 | + $(OBJDIR)/audio/synthesizers_pic.o \ | |
49 | + $(OBJDIR)/audio/tables_pic.o \ | |
50 | + $(OBJDIR)/video/getpicture_pic.o \ | |
51 | + $(OBJDIR)/video/headers_pic.o \ | |
52 | + $(OBJDIR)/video/idct_pic.o \ | |
53 | + $(OBJDIR)/video/macroblocks_pic.o \ | |
54 | + $(OBJDIR)/video/mmxtest_pic.o \ | |
55 | + $(OBJDIR)/video/motion_pic.o \ | |
56 | + $(OBJDIR)/video/mpeg3video_pic.o \ | |
57 | + $(OBJDIR)/video/output_pic.o \ | |
58 | + $(OBJDIR)/video/reconstruct_pic.o \ | |
59 | + $(OBJDIR)/video/seek_pic.o \ | |
60 | + $(OBJDIR)/video/slice_pic.o \ | |
61 | + $(OBJDIR)/video/vlc_pic.o \ | |
62 | + $(OBJDIR)/workarounds_pic.o | |
988f053b | 63 | + |
a6c7fa1d JB |
64 | OUTPUT = $(OBJDIR)/libmpeg3.a |
65 | -SHAREDOUTPUT = $(OBJDIR)/libmpeg3.so | |
66 | +SHAREDOUTPUT = $(OBJDIR)/libmpeg3.so.$(MAJOR).$(MINOR).$(MICRO) | |
67 | UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3split | |
988f053b JR |
68 | LIBS = -lm -lpthread |
69 | ||
a6c7fa1d JB |
70 | @@ -140,20 +180,21 @@ |
71 | $(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(UTILOBJS) | |
72 | ar rcs $(OUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS) | |
988f053b | 73 | |
a6c7fa1d JB |
74 | -$(SHAREDOUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) |
75 | - gcc -shared -o $(SHAREDOUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS) | |
76 | +$(SHAREDOUTPUT): $(SHAREDOBJS) $(SHAREDASMOBJS) $(NASMOBJS) | |
77 | + $(CC) $(LDFLAGSSHARE) -o $(SHAREDOUTPUT) $(SHAREDOBJS) $(SHAREDASMOBJS) $(NASMOBJS) | |
78 | + ln -sf $(SHAREDOUTPUT) libmpeg3.so | |
988f053b | 79 | |
a6c7fa1d JB |
80 | $(OBJDIR)/mpeg3dump: $(OUTPUT) |
81 | - $(CC) -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS) | |
82 | + $(CC) -o $(OBJDIR)/mpeg3dump mpeg3dump.c -L. -lmpeg3 $(LIBS) | |
83 | ||
84 | $(OBJDIR)/mpeg3cat: $(OUTPUT) | |
85 | - $(CC) -o $(OBJDIR)/mpeg3cat mpeg3cat.c $(OUTPUT) $(LIBS) | |
86 | + $(CC) -o $(OBJDIR)/mpeg3cat mpeg3cat.c -L. -lmpeg3 $(LIBS) | |
87 | ||
88 | $(OBJDIR)/mpeg3toc: $(OUTPUT) | |
89 | - $(CC) -o $(OBJDIR)/mpeg3toc mpeg3toc.c $(OUTPUT) $(LIBS) | |
90 | + $(CC) -o $(OBJDIR)/mpeg3toc mpeg3toc.c -L. -lmpeg3 $(LIBS) | |
91 | ||
92 | $(OBJDIR)/mpeg3split: $(OUTPUT) | |
93 | - $(CC) -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS) | |
94 | + $(CC) -o $(OBJDIR)/mpeg3split mpeg3split.c -L. -lmpeg3 $(LIBS) | |
95 | ||
96 | $(OBJDIR)/mpeg2qt: $(OUTPUT) | |
97 | $(CC) -o $(OBJDIR)/mpeg2qt mpeg2qt.c \ | |
98 | @@ -181,6 +222,8 @@ | |
99 | install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)/usr/include/libmpeg3/video | |
100 | install -m 644 $(OUTPUT) $(DESTDIR)/usr/lib | |
101 | install $(SHAREDOUTPUT) $(DESTDIR)/usr/lib | |
102 | + ln -sf libmpeg3.so.$(MAJOR).$(MINOR).$(MICRO) $(DESTDIR)/usr/lib/libmpeg3.so.$(MAJOR) | |
103 | + ln -sf libmpeg3.so.$(MAJOR).$(MINOR).$(MICRO) $(DESTDIR)/usr/lib/libmpeg3.so | |
988f053b | 104 | |
988f053b | 105 | |
988f053b | 106 | |
a6c7fa1d JB |
107 | @@ -201,6 +244,12 @@ |
108 | $(NASMOBJS): | |
109 | $(NASM) -f elf $(subst $(OBJDIR)/,, $*.s) -o $*.o | |
988f053b | 110 | |
a6c7fa1d JB |
111 | +$(OBJDIR)/%_pic.o : %.c |
112 | + $(CC) -c -fPIC -DPIC `cat $(OBJDIR)/c_flags` $< -o $@ | |
988f053b | 113 | + |
a6c7fa1d JB |
114 | +$(OBJDIR)/%_pic.o : %.S |
115 | + $(CC) -c -fPIC -DPIC `cat $(OBJDIR)/c_flags` $< -o $@ | |
988f053b | 116 | + |
a6c7fa1d JB |
117 | $(OBJDIR)/bitstream.o: bitstream.c |
118 | $(OBJDIR)/mpeg3dump.o: mpeg3dump.c | |
119 | $(OBJDIR)/libmpeg3.o: libmpeg3.c | |
120 | diff -Nur libmpeg3.orig/video/slice.c libmpeg3/video/slice.c | |
121 | --- libmpeg3.orig/video/slice.c Mon Oct 1 05:18:31 2001 | |
122 | +++ libmpeg3/video/slice.c Sat Apr 6 00:44:12 2002 | |
123 | @@ -230,7 +230,7 @@ | |
988f053b JR |
124 | "movq %%mm0, (%%eax)\n" |
125 | "movq %%mm0, (%%eax, %1)\n" | |
126 | : | |
127 | - : "D" (rfp), "c" (iincr), "b" (bp) | |
128 | + : "D" (rfp), "c" (iincr), "r" (bp) | |
129 | : "eax"); | |
130 | } | |
131 | else |