Make sure libpthread makes it into libmpeglib. Fixes build problems
noted by Tomasz Luchowski <zuntum@netbsd.org> on tech-pkg
This commit is contained in:
parent
6bcaf425fb
commit
b364b6211b
3 changed files with 19 additions and 7 deletions
|
@ -1,12 +1,12 @@
|
|||
$NetBSD: patch-sum,v 1.1.1.1 2001/03/14 16:13:46 skrll Exp $
|
||||
$NetBSD: patch-sum,v 1.2 2001/03/15 15:35:55 skrll Exp $
|
||||
|
||||
SHA1 (patch-aa) = 95ad22a3085203104c172b86d72fb7eb6e90f63b
|
||||
SHA1 (patch-aa) = 2bfbac804f2170546163ad56cedb3e6501f9f841
|
||||
SHA1 (patch-ab) = 364d905ff5379535285d3c5d462607c0020451d3
|
||||
SHA1 (patch-ac) = 12c40ebb716110873cdd90ecc572ffa370a6d5d1
|
||||
SHA1 (patch-ad) = d32a98772d5367d7230f69b8984913e9c6ab1267
|
||||
SHA1 (patch-ae) = 7f741e996af8e5c542a5cf4654ebee8d18a5a380
|
||||
SHA1 (patch-af) = 4e25ac0e3d25ffb3ed3d22da69214d12b75eff0c
|
||||
SHA1 (patch-ag) = 8b9c2968d5c789355b0ee9055516c77db066546e
|
||||
SHA1 (patch-ag) = 7852ecc3e2181f3589f1f2703ae1737a670b9d13
|
||||
SHA1 (patch-ah) = 496488b19584f3b22d757cd1a56928499015ae31
|
||||
SHA1 (patch-ai) = 6779000b313b0b36e5da3f13f534a726195f332f
|
||||
SHA1 (patch-aj) = 855d8bb34e19bcc89cc07087ca3df339cc9d66a8
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 16:14:04 skrll Exp $
|
||||
$NetBSD: patch-aa,v 1.2 2001/03/15 15:35:56 skrll Exp $
|
||||
|
||||
--- configure.orig Wed Feb 21 11:01:31 2001
|
||||
+++ configure
|
||||
|
@ -63,3 +63,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/14 16:14:04 skrll Exp $
|
|||
Linux)
|
||||
kde_mpeglib_compiles=yes
|
||||
;;
|
||||
@@ -12105,6 +12111,7 @@
|
||||
NetBSD)
|
||||
echo "$ac_t""NetBSD :Unknown hardware. You will have problems!!" 1>&6
|
||||
OS_TYPE="BSD"
|
||||
+ LIBPTHREAD="-lpthread"
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define OS_BSD 1
|
||||
EOF
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-ag,v 1.1.1.1 2001/03/14 16:14:06 skrll Exp $
|
||||
$NetBSD: patch-ag,v 1.2 2001/03/15 15:35:56 skrll Exp $
|
||||
|
||||
--- mpeglib/lib/Makefile.in.orig Wed Feb 21 11:00:42 2001
|
||||
+++ mpeglib/lib/Makefile.in
|
||||
|
@ -12,7 +12,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/03/14 16:14:06 skrll Exp $
|
|||
|
||||
|
||||
EXTRA_DIST = README
|
||||
@@ -268,7 +269,7 @@
|
||||
@@ -268,10 +269,10 @@
|
||||
|
||||
libmpeg_la_SOURCES = dummy.cpp
|
||||
|
||||
|
@ -20,7 +20,11 @@ $NetBSD: patch-ag,v 1.1.1.1 2001/03/14 16:14:06 skrll Exp $
|
|||
+libmpeg_la_LDFLAGS = $(all_libraries) -module -release $(MPEGLIB_VERSION) -version-info $(MPEGLIB_MAJOR_VERSION):$(MPEGLIB_MINOR_VERSION):$(MPEGLIB_MICRO_VERSION) $(LIBOSSAUDIO)
|
||||
|
||||
|
||||
libmpeg_la_LIBADD = $(MPEG_EXTRALIBS) $(MMXFILES) $(MPEGLIB_LIBS)
|
||||
-libmpeg_la_LIBADD = $(MPEG_EXTRALIBS) $(MMXFILES) $(MPEGLIB_LIBS)
|
||||
+libmpeg_la_LIBADD = $(MPEG_EXTRALIBS) $(MMXFILES) $(MPEGLIB_LIBS) $(LIBPTHREAD)
|
||||
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
|
||||
CONFIG_HEADER = ../../config.h
|
||||
@@ -287,9 +288,7 @@
|
||||
libmpeg_la_DEPENDENCIES = mpgplayer/*.lo mpegplay/*.lo splay/*.lo \
|
||||
tplay/*.lo decoder/*.lo output/*.lo input/*.lo util/render/*.lo \
|
||||
|
|
Loading…
Reference in a new issue