[SCM] mjpegtools/master: Add 06_link_pthread.patch: Link mpeg2enc with -lpthread

lucidfox-guest at users.alioth.debian.org lucidfox-guest at users.alioth.debian.org
Sun May 1 05:17:55 UTC 2011


The following commit has been merged in the master branch:
commit a40e8b81d61ad6f0ac25547447d08b76278956d3
Author: Maia Kozheva <sikon at ubuntu.com>
Date:   Sun May 1 11:54:11 2011 +0700

    Add 06_link_pthread.patch: Link mpeg2enc with -lpthread

diff --git a/debian/patches/06_link_pthread.patch b/debian/patches/06_link_pthread.patch
new file mode 100644
index 0000000..c172aa2
--- /dev/null
+++ b/debian/patches/06_link_pthread.patch
@@ -0,0 +1,26 @@
+Index: mjpegtools/mpeg2enc/Makefile.am
+===================================================================
+--- mjpegtools.orig/mpeg2enc/Makefile.am	2011-05-01 11:53:34.089150005 +0700
++++ mjpegtools/mpeg2enc/Makefile.am	2011-05-01 11:54:20.000000000 +0700
+@@ -78,7 +78,7 @@
+ 
+ libmpeg2encpp_la_DEPENDENCIES = $(LIBMJPEGUTILS)
+ 
+-libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) @PTHREAD_LIBS@
++libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) @PTHREAD_LIBS@ -lpthread
+ 
+ mpeg2enc_DEPENDENCIES = \
+ 	$(LIBMJPEGUTILS) \
+Index: mjpegtools/mpeg2enc/Makefile.in
+===================================================================
+--- mjpegtools.orig/mpeg2enc/Makefile.in	2011-05-01 11:53:34.069150005 +0700
++++ mjpegtools/mpeg2enc/Makefile.in	2011-05-01 11:57:05.469149902 +0700
+@@ -358,7 +358,7 @@
+ 	-release $(LT_RELEASE) ${EXTRA_LDFLAGS}
+ 
+ libmpeg2encpp_la_DEPENDENCIES = $(LIBMJPEGUTILS)
+-libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) @PTHREAD_LIBS@
++libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) @PTHREAD_LIBS@ -lpthread
+ mpeg2enc_DEPENDENCIES = \
+ 	$(LIBMJPEGUTILS) \
+ 	libmpeg2encpp.la
diff --git a/debian/patches/series b/debian/patches/series
index a7ae75d..d35c08d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 03_disable_optimization.patch
 04_manpage-syntax.patch
 05_ignore_videodev.h_error.patch
+06_link_pthread.patch

-- 
mjpegtools packaging



More information about the pkg-multimedia-commits mailing list