diff options
| author | fredb <fredb@pkgsrc.org> | 2003-02-13 16:31:24 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2003-02-13 16:31:24 +0000 |
| commit | 5a2293b5d6ce09bdb57657393a61b2c4c1716e98 (patch) | |
| tree | acf74d0dd305e5e811bd1c66c2ed9873a7bea718 /graphics | |
| parent | 82d14d16d99777fa9557f0bf264a0deaba422b2e (diff) | |
| download | pkgsrc-5a2293b5d6ce09bdb57657393a61b2c4c1716e98.tar.gz | |
Add suitable arguments to "avifile-config --libs" for autodetected XFree 4
static libraries, where required. [You can't have a shared library run-time
dependency on a static library.] This may let "apla" build again on systems
with XFree 4 -- not tested.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/avifile-devel/Makefile | 4 | ||||
| -rw-r--r-- | graphics/avifile-devel/buildlink2.mk | 4 | ||||
| -rw-r--r-- | graphics/avifile-devel/distinfo | 3 | ||||
| -rw-r--r-- | graphics/avifile-devel/patches/patch-ac | 18 |
4 files changed, 24 insertions, 5 deletions
diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile index 4d4aebf7e30..d43ec73b823 100644 --- a/graphics/avifile-devel/Makefile +++ b/graphics/avifile-devel/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.29 2003/02/02 21:53:25 zuntum Exp $ +# $NetBSD: Makefile,v 1.30 2003/02/13 16:31:24 fredb Exp $ # DISTNAME= avifile-0.6.20010814 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/avifile-devel/buildlink2.mk b/graphics/avifile-devel/buildlink2.mk index cf2c1ac4eb6..fe79d344b84 100644 --- a/graphics/avifile-devel/buildlink2.mk +++ b/graphics/avifile-devel/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.3 2002/08/28 05:29:41 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2003/02/13 16:31:25 fredb Exp $ .if !defined(AVIFILE_BUILDLINK2_MK) AVIFILE_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= avifile -BUILDLINK_DEPENDS.avifile?= avifile>=0.6 +BUILDLINK_DEPENDS.avifile?= avifile>=0.6.20010814nb2 BUILDLINK_PKGSRCDIR.avifile?= ../../graphics/avifile-devel EVAL_PREFIX+= BUILDLINK_PREFIX.avifile=avifile diff --git a/graphics/avifile-devel/distinfo b/graphics/avifile-devel/distinfo index 226e7614bf5..0c86dd79903 100644 --- a/graphics/avifile-devel/distinfo +++ b/graphics/avifile-devel/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.12 2002/10/09 13:05:02 wiz Exp $ +$NetBSD: distinfo,v 1.13 2003/02/13 16:31:25 fredb Exp $ SHA1 (avifile-0.6.20010814.tar.bz2) = 695227679dd09e9b9d1fb71caf58a9d92204b262 Size (avifile-0.6.20010814.tar.bz2) = 1067753 bytes SHA1 (patch-aa) = b7da74c557f6107d160a06d8215de28fcb8d065a SHA1 (patch-ab) = 3cdeb5e5d3c692e00e1b2da72e859b48989eb7f2 +SHA1 (patch-ac) = 82f089b95d1328c5980cb2d543f2eaef41b9862b diff --git a/graphics/avifile-devel/patches/patch-ac b/graphics/avifile-devel/patches/patch-ac new file mode 100644 index 00000000000..ac28af17649 --- /dev/null +++ b/graphics/avifile-devel/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.3 2003/02/13 16:31:25 fredb Exp $ + +--- avifile-config.in.orig Tue Aug 14 14:51:13 2001 ++++ avifile-config.in +@@ -99,7 +99,12 @@ else + fi + + if test "$lib_dir" != "/usr/lib"; then +- libs="-L$lib_dir @AVIFILE_RLD_FLAGS@ -laviplay" ++ if test -n "@DGA_LDADD@@VM_LDADD@@XV_LDADD@"; then ++ X_LDFLAGS="@X_LDFLAGS@" ++ libs="-L$lib_dir @AVIFILE_RLD_FLAGS@ -laviplay $X_LDFLAGS ${X_LDFLAGS:+-Wl,-rpath,}${X_LDFLAGS#*-L} @DGA_LDADD@ @VM_LDADD@ @XV_LDADD@" ++ else ++ libs="-L$lib_dir @AVIFILE_RLD_FLAGS@ -laviplay" ++ fi + else + libs="@AVIFILE_RLD_FLAGS@ -laviplay" + fi |