]> git.pld-linux.org Git - packages/transcode.git/blame - transcode-pic.patch
projects / packages / transcode.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- rel 11
[packages/transcode.git] / transcode-pic.patch
CommitLineData
455e7e7f 1diff -Nur transcode-0.6.12.orig/export/Makefile.am transcode-0.6.12/export/Makefile.am
2--- transcode-0.6.12.orig/export/Makefile.am 2003-12-20 12:49:11.000000000 +0100
3+++ transcode-0.6.12/export/Makefile.am 2004-05-08 14:02:59.000000000 +0200
4@@ -3,7 +3,7 @@
5 AUTOMAKE_OPTIONS = 1.3 foreign
6 DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
7
8-AC3_LIB=-L../libac3 -lac3_tc
9+AC3_LIB=../libac3/libac3_tc.la
10 AC3_INC=-I../libac3 -I$(srcdir)/../libac3
11
12 INCLUDES = -I./ -I../ -I$(srcdir)/.. -I../src -I$(srcdir)/../src -I../avilib -I$(srcdir)/../avilib @AVIFILE_CFLAGS@ @LAME_CFLAGS@ $(AC3_INC) @QT_CFLAGS@ -Wall @DV_CFLAGS@ -I../libvo -I$(srcdir)/../libvo @MJPEG_CFLAGS@ @LIBFAME_CFLAGS@ @MAGICK_CFLAGS@ @LIBJPEG_CFLAGS@ -I../libioaux -I$(srcdir)/../libioaux @LZO_CFLAGS@ @PVM3_CFLAGS@ -I../pvm3
13@@ -153,7 +153,7 @@
14
15 export_ffmpeg_la_SOURCES = export_ffmpeg.c aud_aux.c ffmpeg_cfg.c vid_aux.c
16 export_ffmpeg_la_LDFLAGS = -module -avoid-version
17-export_ffmpeg_la_LIBADD = @LAME_LIBS@ -L../libvo -lvout $(AC3_LIB) -lm
18+export_ffmpeg_la_LIBADD = @LAME_LIBS@ ../libvo/libvout.la $(AC3_LIB) -lm
19
20 export_divx4raw_la_SOURCES = export_divx4raw.c aud_aux.c divx4_vbr.c
21 export_divx4raw_la_LDFLAGS = -module -avoid-version
22diff -Nur transcode-0.6.12.orig/import/Makefile.am transcode-0.6.12/import/Makefile.am
23--- transcode-0.6.12.orig/import/Makefile.am 2003-12-20 12:49:13.000000000 +0100
24+++ transcode-0.6.12/import/Makefile.am 2004-05-08 14:02:59.000000000 +0200
25@@ -3,9 +3,9 @@
26 AUTOMAKE_OPTIONS = 1.3 foreign
27 DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
28
29-MPEG2_LIB=-L../libmpeg2 -lmpeg2cvs
30+MPEG2_LIB=../libmpeg2/libmpeg2cvs.la
31 MPEG2_INC=-I../libmpeg2 -I$(srcdir)/../libmpeg2
32-AC3_LIB=-L../libac3 -lac3_tc
33+AC3_LIB=../libac3/libac3_tc.la
34 AC3_INC=-I../libac3 -I$(srcdir)/../libac3
35
36 INCLUDES = -Wall -I./ -I../src -I../avilib $(AC3_INC) $(MPEG2_INC) -I../libvo -I$(srcdir)/../src -I$(srcdir)/../avilib -I$(srcdir)/../libvo @LAME_CFLAGS@ @DV_CFLAGS@ @LIBMPEG3_CFLAGS@ @A52_CFLAGS@ @AVIFILE_CFLAGS@ @MAGICK_CFLAGS@ @QT_CFLAGS@ @LIBXML2_CFLAGS@ @DVDREAD_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ @THEORA_CFLAGS@ @LZO_CFLAGS@
37diff -Nur transcode-0.6.12.orig/libac3/Makefile.am transcode-0.6.12/libac3/Makefile.am
38--- transcode-0.6.12.orig/libac3/Makefile.am 2003-12-21 00:28:08.000000000 +0100
39+++ transcode-0.6.12/libac3/Makefile.am 2004-05-08 14:05:43.000000000 +0200
40@@ -2,11 +2,11 @@
41 AUTOMAKE_OPTIONS = 1.3 foreign
42 DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
43
44-CFLAGS = -O3 -funroll-loops -ffast-math -DLINUX -fPIC -DPIC @CFLAGS@
45+CFLAGS = -funroll-loops -ffast-math -DLINUX -fPIC -DPIC @CFLAGS@
46
47-noinst_LIBRARIES = libac3_tc.a
48+noinst_LTLIBRARIES = libac3_tc.la
49
50-libac3_tc_a_SOURCES = bitstream.c decode.c imdct.c coeff.c exponent.c stats.c\
51+libac3_tc_la_SOURCES = bitstream.c decode.c imdct.c coeff.c exponent.c stats.c\
52 bit_allocate.c parse.c crc.c debug.c rematrix.c downmix.c dither.c \
53 sanity_check.c
54
55diff -Nur transcode-0.6.12.orig/libmpeg2/Makefile.am transcode-0.6.12/libmpeg2/Makefile.am
56--- transcode-0.6.12.orig/libmpeg2/Makefile.am 2003-12-21 00:28:08.000000000 +0100
57+++ transcode-0.6.12/libmpeg2/Makefile.am 2004-05-08 14:02:59.000000000 +0200
58@@ -3,9 +3,9 @@
59
60 CFLAGS = -Wall -fPIC -DPIC @CFLAGS@ -I../libvo -I$(srcdir)/../libvo
61
62-noinst_LIBRARIES = libmpeg2cvs.a
63+noinst_LTLIBRARIES = libmpeg2cvs.la
64
65-libmpeg2cvs_a_SOURCES = cpu_state.c decode.c header.c stats.c slice.c \
66+libmpeg2cvs_la_SOURCES = cpu_state.c decode.c header.c stats.c slice.c \
67 motion_comp.c motion_comp_mmx.c motion_comp_mlib.c\
68 idct.c idct_mlib.c idct_mmx.c \
69 idct_altivec.c motion_comp_altivec.c
70diff -Nur transcode-0.6.12.orig/libvo/Makefile.am transcode-0.6.12/libvo/Makefile.am
71--- transcode-0.6.12.orig/libvo/Makefile.am 2003-12-21 00:28:08.000000000 +0100
72+++ transcode-0.6.12/libvo/Makefile.am 2004-05-08 14:09:32.000000000 +0200
73@@ -3,9 +3,9 @@
74 DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
75
76 CFLAGS = -Wall -fPIC -DPIC @CFLAGS@ -I../libmpeg2 -I$(srcdir)/../libmpeg2
77-noinst_LIBRARIES = libvout.a
78+noinst_LTLIBRARIES = libvout.la
79
80-libvout_a_SOURCES = video_out.c video_out_ppm.c video_out_yuv.c yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c cpu_accel.c rgb2yuv.c
81+libvout_la_SOURCES = video_out.c video_out_ppm.c video_out_yuv.c yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c cpu_accel.c rgb2yuv.c
82
83 noinst_HEADERS = yuv2rgb.h video_out_internal.h video_out.h rgb2yuv.h mmx.h mm_accel.h
84 EXTRA_DIST = COPYING AUTHORS README
85diff -Nur transcode-0.6.12.orig/libvo/cpu_accel.c transcode-0.6.12/libvo/cpu_accel.c
86--- transcode-0.6.12.orig/libvo/cpu_accel.c 2003-12-21 00:42:08.000000000 +0100
87+++ transcode-0.6.12/libvo/cpu_accel.c 2004-05-08 14:09:06.000000000 +0200
88@@ -34,9 +34,12 @@
89
90 #if !defined(PIC) && !defined(__PIC__)
91 #define cpuid(op,eax,ebx,ecx,edx) \
92- __asm__ ("cpuid" \
93+ asm ("pushl %%ebx\n" \
94+ "cpuid\n" \
95+ "movl %%ebx, %%edi\n" \
96+ "popl %%ebx" \
97 : "=a" (eax), \
98- "=b" (ebx), \
99+ "=D" (ebx), \
100 "=c" (ecx), \
101 "=d" (edx) \
102 : "a" (op) \
Video stream converter
This page took 0.108916 seconds and 4 git commands to generate.