diff options
| author | sbd <sbd@pkgsrc.org> | 2011-12-24 03:02:25 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2011-12-24 03:02:25 +0000 |
| commit | a8ac393f6a4cb766c038c5b973a5063a7e26cbb4 (patch) | |
| tree | 407fbe412fd04fefe2a766f09f527ddeb7ec9f65 /multimedia/xine-lib | |
| parent | 6c3a7cbb562932ed22c806f77b9c74eec7e0d59d (diff) | |
| download | pkgsrc-a8ac393f6a4cb766c038c5b973a5063a7e26cbb4.tar.gz | |
A simpler way to decide if -lXinerama is need is to use XINERAMA_LIBS which
gets its value from pkg-config.
Also add 'automake' to USE_TOOLS and the pre-configure target.
Diffstat (limited to 'multimedia/xine-lib')
| -rw-r--r-- | multimedia/xine-lib/Makefile.common | 5 | ||||
| -rw-r--r-- | multimedia/xine-lib/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/xine-lib/patches/patch-ap | 14 |
3 files changed, 7 insertions, 16 deletions
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common index 733d1fbb3d2..315c80569ab 100644 --- a/multimedia/xine-lib/Makefile.common +++ b/multimedia/xine-lib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.71 2011/11/18 07:27:43 obache Exp $ +# $NetBSD: Makefile.common,v 1.72 2011/12/24 03:02:25 sbd Exp $ # # used by audio/xine-alsa/Makefile # used by audio/xine-arts/Makefile @@ -28,7 +28,7 @@ USE_PKGLOCALEDIR= YES USE_LIBTOOL= YES LIBTOOL_OVERRIDE= libtool libtool-nofpic PKGCONFIG_OVERRIDE= misc/libxine.pc.in -USE_TOOLS+= autoconf gmake msgfmt pkg-config xmkmf perl +USE_TOOLS+= autoconf automake gmake msgfmt pkg-config xmkmf perl CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32' #CONFIGURE_ARGS+= --without-external-ffmpeg --disable-ffmpegtest @@ -66,6 +66,7 @@ BUILDLINK_TRANSFORM+= "rm:-Wl,--no-undefined" pre-configure: ${TOUCH} ${WRKSRC}/lib/dummy.c + cd ${WRKSRC} && automake -Wnone cd ${WRKSRC} && autoheader cd ${WRKSRC} && autoconf diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index a3c4ca99ac3..e08b5d1159e 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.76 2011/11/20 11:43:36 marino Exp $ +$NetBSD: distinfo,v 1.77 2011/12/24 03:02:25 sbd Exp $ SHA1 (xine-lib-1.1.20.tar.bz2) = 60ce1cea9bf7a6b7d8c60141593a8ed0c54f9445 RMD160 (xine-lib-1.1.20.tar.bz2) = c531b74142ad92b7fe2956c69fd1398e7c8cb1fb @@ -8,7 +8,7 @@ SHA1 (patch-ag) = 96a2bab961ca90d7e3c1d67b6aa09388f9478d35 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b SHA1 (patch-ak) = 987700e6526b5112ac66bd6a8f9ee41f338c3508 SHA1 (patch-ao) = 2682548a181803bc2d79f79d76828b6b3ba0e4fa -SHA1 (patch-ap) = d82c27dd5bd21dbaeb7b981eb36b36f580a2d30c +SHA1 (patch-ap) = 4bc0c3923b50049f166f3bec703705ae33c166e9 SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834 SHA1 (patch-be) = 6d03de71811bd03295621d04d3166625f4f4f079 SHA1 (patch-bg) = f072486eb8441b8bed2c825380aa04d99bc70cc1 diff --git a/multimedia/xine-lib/patches/patch-ap b/multimedia/xine-lib/patches/patch-ap index 423e1c2f1f3..8826935ca91 100644 --- a/multimedia/xine-lib/patches/patch-ap +++ b/multimedia/xine-lib/patches/patch-ap @@ -1,23 +1,13 @@ -$NetBSD: patch-ap,v 1.10 2011/11/16 19:45:37 drochner Exp $ +$NetBSD: patch-ap,v 1.11 2011/12/24 03:02:25 sbd Exp $ --- src/dxr3/Makefile.am.orig 2011-10-04 21:42:53.000000000 +0000 +++ src/dxr3/Makefile.am -@@ -17,6 +17,9 @@ endif - if HAVE_LIBRTE - link_rte = -lrte - endif -+if HAVE_XINERAMA -+link_xinerama = -lXinerama -+endif - - EXTRA_DIST = compat.c - @@ -45,7 +48,7 @@ xineplug_vo_out_dxr3_la_SOURCES = \ dxr3_scr.c \ video_out_dxr3.c -xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm -+xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_xinerama) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm ++xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(DYNAMIC_LD_LIBS) -lm $(XINERAMA_LIBS) xineplug_vo_out_dxr3_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) xineplug_vo_out_dxr3_la_LDFLAGS = $(xineplug_ldflags) |