diff options
Diffstat (limited to 'multimedia/win32-codecs/files')
| -rw-r--r-- | multimedia/win32-codecs/files/patch-ab | 32 | ||||
| -rw-r--r-- | multimedia/win32-codecs/files/patch-ad | 22 | ||||
| -rw-r--r-- | multimedia/win32-codecs/files/patch-ae | 17 |
3 files changed, 28 insertions, 43 deletions
diff --git a/multimedia/win32-codecs/files/patch-ab b/multimedia/win32-codecs/files/patch-ab index 6079eb3293b3..5b0f59a9bd72 100644 --- a/multimedia/win32-codecs/files/patch-ab +++ b/multimedia/win32-codecs/files/patch-ab @@ -1,11 +1,23 @@ ---- xmps-avi-plugin/Makefile.in.orig Fri Oct 6 13:05:55 2000 -+++ xmps-avi-plugin/Makefile.in Fri Oct 6 13:06:22 2000 -@@ -1,6 +1,6 @@ --LIBS = -lstdc++ -L../lib -L@libdir@ -laviplay -lpthread @XMPS_LIBS@ -+LIBS = -lstdc++ -L../lib -L@libdir@ -laviplay -lpthread @XMPS_LIBS@ @SDL_LIBS@ +--- lib/loader/win32.c.orig Thu Jan 4 01:18:05 2001 ++++ lib/loader/win32.c Thu Jan 4 01:18:10 2001 +@@ -1085,6 +1085,7 @@ + static double CPU_Freq() + { + //#ifdef USE_TSC ++#ifdef __Linux__ + FILE *f = fopen ("/proc/cpuinfo", "r"); + char line[200]; + char model[200]="unknown"; +@@ -1121,9 +1122,9 @@ + fclose(f); + if(freq<0)return old_freq(); + return freq; +-//#else +-// return old_freq(); +-//#endif ++#else ++ return old_freq(); ++#endif + } --INCLUDES = -I. -I../include -I@includedir@/avifile @XMPS_CFLAGS@ -+INCLUDES = -I. -I../include -I@includedir@/avifile @XMPS_CFLAGS@ @SDL_CFLAGS@ - - all: avi_configure.o avi_codec.o - $(CC) -shared avi_configure.o avi_codec.o $(LIBS) -o libavi.so + long WINAPI expQueryPerformanceFrequency(long long* z) diff --git a/multimedia/win32-codecs/files/patch-ad b/multimedia/win32-codecs/files/patch-ad deleted file mode 100644 index 03103c655807..000000000000 --- a/multimedia/win32-codecs/files/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.in.orig Tue Oct 3 08:19:35 2000 -+++ Makefile.in Fri Oct 6 13:36:01 2000 -@@ -66,17 +66,14 @@ - $(INSTALL_PROGRAM) -m0755 ./avifile-config $(bindir) - - install: -- -$(INSTALL_PROGRAM) -d $(datadir) - -$(INSTALL_PROGRAM) -d $(includedir)/avifile/wine - -$(INSTALL_PROGRAM) -d $(datadir)/avifile -- -$(INSTALL_PROGRAM) -d $(libdir) -- -$(INSTALL_PROGRAM) -d $(bindir) - -$(INSTALL_PROGRAM) ./lib/libaviplay.so $(libdir) - -$(INSTALL_PROGRAM) ./include/*.h $(includedir)/avifile - -$(INSTALL_PROGRAM) ./include/wine/*.h $(includedir)/avifile/wine - ifeq (@USE_QT@,1) -- -$(INSTALL_PROGRAM) ./bin/aviplay $(bindir) -- -$(INSTALL_PROGRAM) ./bin/benchmark $(bindir) -+ -$(INSTALL_PROGRAM) -s ./bin/aviplay $(bindir) -+ -$(INSTALL_PROGRAM) -s ./bin/benchmark $(bindir) - -$(INSTALL_PROGRAM) ./bin/*.ppm $(datadir)/avifile - -$(INSTALL_PROGRAM) ./bin/*.png $(datadir)/avifile - ifeq (@USE_VIDCAP@,1) diff --git a/multimedia/win32-codecs/files/patch-ae b/multimedia/win32-codecs/files/patch-ae index a981756b0a99..38258f8a1512 100644 --- a/multimedia/win32-codecs/files/patch-ae +++ b/multimedia/win32-codecs/files/patch-ae @@ -1,24 +1,19 @@ ---- aclocal.m4.orig Thu Oct 19 22:48:29 2000 -+++ aclocal.m4 Thu Oct 19 22:49:17 2000 -@@ -552,8 +552,8 @@ - LDFLAGS="-L$qt_libdir $X_LDFLAGS" +--- aclocal.m4.orig Thu Dec 21 15:30:34 2000 ++++ aclocal.m4 Thu Dec 21 15:31:01 2000 +@@ -569,7 +569,7 @@ if test "$qt_libdir" ; then -- ac_QT_NAME=-lqt + ac_QT_NAME=$DEFAULTQTLIB - AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt) -+ ac_QT_NAME=-lqt2 +dnl AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt) fi; LIBS="$LIBS $ac_QT_NAME -lXext -lX11 $LIBSOCKET" -@@ -592,8 +592,8 @@ - ]) +@@ -609,7 +609,7 @@ else have_qt="yes" -- ac_QT_NAME=-lqt + ac_QT_NAME=$DEFAULTQTLIB - AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt) -+ ac_QT_NAME=-lqt2 +dnl AC_CHECK_LIB(qt-mt, main,ac_QT_NAME=-lqt-mt) LIBS="$LIBS $ac_QT_NAME -lXext -lX11 $LIBSOCKET" fi - |