libdv:moved into main for pisi 2.0
This commit is contained in:
@@ -0,0 +1,17 @@
|
||||
--- libdv-0.99/libdv/enc_input.c 2002-12-31 23:04:02.000000000 +0000
|
||||
+++ libdv-0.99/libdv/enc_input.c.plasmaroo 2003-12-30 16:42:19.000000000 +0000
|
||||
@@ -48,13 +48,13 @@
|
||||
|
||||
#if HAVE_DEV_VIDEO
|
||||
#include <sys/types.h>
|
||||
-#include <linux/videodev.h>
|
||||
#include <sys/time.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/mman.h>
|
||||
+#include <linux/videodev.h>
|
||||
#endif
|
||||
|
||||
// #define ARCH_X86 0
|
||||
@@ -0,0 +1,12 @@
|
||||
We now need to explicitly link to libraries that we use because we can no
|
||||
longer depend on our dependencies to pull them in for us. See
|
||||
http://fedoraproject.org/wiki/UnderstandingDSOLinkChange
|
||||
|
||||
--- libdv-1.0.0/playdv/#Makefile.am~ 2010-02-15 14:49:06.000000000 -0500
|
||||
+++ libdv-1.0.0/playdv/Makefile.am 2010-02-15 14:49:06.000000000 -0500
|
||||
@@ -15,4 +15,4 @@ bin_PROGRAMS= playdv
|
||||
noinst_HEADERS= display.h oss.h
|
||||
|
||||
playdv_SOURCES= playdv.c display.c display.h oss.c
|
||||
-playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB)
|
||||
+playdv_LDADD= $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) -lX11 -lXext
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,11 @@
|
||||
--- libdv-1.0.0/libdv/dv.c.mmx_athlon 2004-10-20 05:49:24.000000000 +0200
|
||||
+++ libdv-1.0.0/libdv/dv.c 2009-04-11 08:52:09.000000000 +0200
|
||||
@@ -170,7 +170,7 @@
|
||||
static int done=FALSE;
|
||||
if(done) goto init_done;
|
||||
#if ARCH_X86
|
||||
- dv_use_mmx = mmx_ok();
|
||||
+ dv_use_mmx = 1;
|
||||
#endif
|
||||
|
||||
/* decoder */
|
||||
Reference in New Issue
Block a user