SOURCES: mjpegtools-link.patch - liblavfile doesn't need -ljpeg

qboosh qboosh at pld-linux.org
Mon Dec 25 13:24:41 CET 2006


Author: qboosh                       Date: Mon Dec 25 12:24:41 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- liblavfile doesn't need -ljpeg

---- Files affected:
SOURCES:
   mjpegtools-link.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/mjpegtools-link.patch
diff -u SOURCES/mjpegtools-link.patch:1.2 SOURCES/mjpegtools-link.patch:1.3
--- SOURCES/mjpegtools-link.patch:1.2	Tue Oct 11 10:31:48 2005
+++ SOURCES/mjpegtools-link.patch	Mon Dec 25 13:24:36 2006
@@ -1,9 +1,14 @@
 --- mjpegtools-1.8.0/lavtools/Makefile.am.orig	2005-06-16 19:09:37.000000000 +0200
-+++ mjpegtools-1.8.0/lavtools/Makefile.am	2005-10-11 10:13:32.000000000 +0200
-@@ -43,18 +43,29 @@
- liblavfile_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(JPEG_CFLAGS) $(LIBQUICKTIME_CFLAGS)
++++ mjpegtools-1.8.0/lavtools/Makefile.am	2006-12-25 12:51:09.583398899 +0100
+@@ -40,21 +40,32 @@
+ 	-release $(LT_RELEASE)
+ 
+ liblavfile_la_SOURCES = editlist.c lav_io.c avilib.c
+-liblavfile_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(JPEG_CFLAGS) $(LIBQUICKTIME_CFLAGS)
++liblavfile_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(LIBQUICKTIME_CFLAGS)
  liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) \
- 	$(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS)
+-	$(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS)
++	$(LIBQUICKTIME_LIBS) $(LIBDV_LIBS)
 +liblavfile_la_LIBADD = $(top_builddir)/utils/libmjpegutils.la
  
  liblavjpeg_la_SOURCES = jpegutils.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mjpegtools-link.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list