[SCM] mjpegtools/master: Refresh 02_as-needed.patch; most changes are applied upstream, only patch ltmain.sh

[lucidfox-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2c0355bb5c5d6f2456d812b59dc5ce19b309dfcb
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Sun May 1 01:09:29 2011 +0700

    Refresh 02_as-needed.patch; most changes are applied upstream, only patch ltmain.sh

diff --git a/debian/patches/02_as-needed.patch b/debian/patches/02_as-needed.patch
index 04f94fc..74fe032 100644
--- a/debian/patches/02_as-needed.patch
+++ b/debian/patches/02_as-needed.patch
@@ -1,77 +1,9 @@
-diff -Nur mjpegtools-1.9.0rc3/lavtools/Makefile.am mjpegtools-1.9.0rc3.new/lavtools/Makefile.am
---- mjpegtools-1.9.0rc3/lavtools/Makefile.am
-+++ mjpegtools-1.9.0rc3.new/lavtools/Makefile.am
-@@ -40,25 +40,24 @@
- 
- liblavfile_la_SOURCES = editlist.c lav_io.c avilib.c
- liblavfile_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(JPEG_CFLAGS)
--liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) \
--	$(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS)
--liblavfile_la_LIBADD = $(LIBMJPEGUTILS)
-+liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
-+liblavfile_la_LIBADD = $(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS) $(LIBMJPEGUTILS)
- 
- liblavjpeg_la_SOURCES = jpegutils.c
- liblavjpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS)
--liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) $(JPEG_LIBS)
--liblavjpeg_la_LIBADD = $(LIBMJPEGUTILS)
-+liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
-+liblavjpeg_la_LIBADD = $(JPEG_LIBS) $(LIBMJPEGUTILS)
- 
- liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c
- liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about audiolib & frequencies
- liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
--liblavrec_la_LIBADD = liblavfile.la liblavjpeg.la
-+liblavrec_la_LIBADD = liblavfile.la liblavjpeg.la $(LIBMJPEGUTILS)
- liblavrec_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
- 
- liblavplay_la_SOURCES = liblavplay.c audiolib.c
- liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
- liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
--liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la
-+liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la $(LIBDV_LIBS) $(LIBMJPEGUTILS)
- if HAVE_V4L
-    liblavplay_la_LIBADD += ${X_LIBS} -lX11
- endif
-diff -Nur mjpegtools-1.9.0rc3/lavtools/Makefile.in mjpegtools-1.9.0rc3.new/lavtools/Makefile.in
---- mjpegtools-1.9.0rc3/lavtools/Makefile.in
-+++ mjpegtools-1.9.0rc3.new/lavtools/Makefile.in
-@@ -433,24 +433,22 @@
- 
- liblavfile_la_SOURCES = editlist.c lav_io.c avilib.c
- liblavfile_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(JPEG_CFLAGS)
--liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) \
--	$(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS)
--
--liblavfile_la_LIBADD = $(LIBMJPEGUTILS)
-+liblavfile_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
-+liblavfile_la_LIBADD = $(LIBQUICKTIME_LIBS) $(JPEG_LIBS) $(LIBDV_LIBS) $(LIBMJPEGUTILS)
- liblavjpeg_la_SOURCES = jpegutils.c
- liblavjpeg_la_CPPFLAGS = $(AM_CPPFLAGS) $(JPEG_CFLAGS)
--liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS) $(JPEG_LIBS)
--liblavjpeg_la_LIBADD = $(LIBMJPEGUTILS)
-+liblavjpeg_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
-+liblavjpeg_la_LIBADD = $(JPEG_LIBS) $(LIBMJPEGUTILS)
- liblavrec_la_SOURCES = liblavrec.c audiolib.c frequencies.c
- liblavrec_la_CPPFLAGS = $(AM_CPPFLAGS) # so automake doesn't complain about audiolib & frequencies
- liblavrec_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
--liblavrec_la_LIBADD = liblavfile.la liblavjpeg.la
-+liblavrec_la_LIBADD = liblavfile.la liblavjpeg.la $(LIBMJPEGUTILS)
- liblavrec_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
- liblavplay_la_SOURCES = liblavplay.c audiolib.c
- liblavplay_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDV_CFLAGS) $(X_CFLAGS)
- liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
- liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la \
--	$(am__append_4)
-+	$(am__append_4) $(LIBDV_LIBS) $(LIBMJPEGUTILS)
- liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
- noinst_HEADERS = \
- 	colorspace.h \
-diff -Nur mjpegtools-1.9.0rc3/ltmain.sh mjpegtools-1.9.0rc3.new/ltmain.sh
---- mjpegtools-1.9.0rc3/ltmain.sh
-+++ mjpegtools-1.9.0rc3.new/ltmain.sh
-@@ -1670,6 +1670,11 @@
- 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+Index: mjpegtools/ltmain.sh
+===================================================================
+--- mjpegtools.orig/ltmain.sh	2011-04-30 23:56:13.000000000 +0700
++++ mjpegtools/ltmain.sh	2011-05-01 01:07:19.991597501 +0700
+@@ -4716,6 +4716,11 @@
+ 	arg=$func_stripname_result
  	;;
  
 +      -Wl,--as-needed)
@@ -80,9 +12,9 @@ diff -Nur mjpegtools-1.9.0rc3/ltmain.sh mjpegtools-1.9.0rc3.new/ltmain.sh
 +	;;
 +
        -Wl,*)
- 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- 	arg=
-@@ -2006,6 +2011,15 @@
+ 	func_stripname '-Wl,' '' "$arg"
+ 	args=$func_stripname_result
+@@ -5067,6 +5072,15 @@
  	lib=
  	found=no
  	case $deplib in
@@ -95,30 +27,6 @@ diff -Nur mjpegtools-1.9.0rc3/ltmain.sh mjpegtools-1.9.0rc3.new/ltmain.sh
 +	  fi
 +	  continue
 +	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
  	  if test "$linkmode,$pass" = "prog,link"; then
  	    compile_deplibs="$deplib $compile_deplibs"
-diff -Nur mjpegtools-1.9.0rc3/mpeg2enc/Makefile.am mjpegtools-1.9.0rc3.new/mpeg2enc/Makefile.am
---- mjpegtools-1.9.0rc3/mpeg2enc/Makefile.am
-+++ mjpegtools-1.9.0rc3.new/mpeg2enc/Makefile.am
-@@ -78,7 +78,7 @@
- 
- libmpeg2encpp_la_DEPENDENCIES = $(LIBMJPEGUTILS)
- 
--libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS)
-+libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) -lpthread
- 
- mpeg2enc_DEPENDENCIES = \
- 	$(LIBMJPEGUTILS) \
-diff -Nur mjpegtools-1.9.0rc3/mpeg2enc/Makefile.in mjpegtools-1.9.0rc3.new/mpeg2enc/Makefile.in
---- mjpegtools-1.9.0rc3/mpeg2enc/Makefile.in
-+++ mjpegtools-1.9.0rc3.new/mpeg2enc/Makefile.in
-@@ -347,7 +347,7 @@
- 	-release $(LT_RELEASE) ${EXTRA_LDFLAGS}
- 
- libmpeg2encpp_la_DEPENDENCIES = $(LIBMJPEGUTILS)
--libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS)
-+libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) -lpthread
- mpeg2enc_DEPENDENCIES = \
- 	$(LIBMJPEGUTILS) \
- 	libmpeg2encpp.la

-- 
mjpegtools packaging