diff options
| author | zuntum <zuntum@pkgsrc.org> | 2001-08-19 08:55:59 +0000 |
|---|---|---|
| committer | zuntum <zuntum@pkgsrc.org> | 2001-08-19 08:55:59 +0000 |
| commit | 6d8a2114b033bff3272f38e06ef4c5040fad8c43 (patch) | |
| tree | ef4573c9767911b01641a8154eafd1e7f4b5cfbe /graphics/avifile-devel/Makefile | |
| parent | 747a7f4680dd4d7a4377f4bb274942d316a923bb (diff) | |
| download | pkgsrc-6d8a2114b033bff3272f38e06ef4c5040fad8c43.tar.gz | |
o move files that build only when qt is enabled to separate file - pkg/PLIST.qt,
and use this file *in addition to pkg/PLIST* when AVIFILE_WITH_QT is set to "YES"
# it would be more logical to set PLIST_SRC to PLIST first and then add PLIST.qt to it,
# but @dirrm lib/avifile-0.6 will fail while processing pkg/PLIST,
# because the directory still contains files (they are listed in PLIST.qt) and isn't empty,
# thus can't be removed
o rename "WITH_QT" to "AVIFILE_USE_QT", and add this variable to mk.conf.example
o reorder things in Makefile so we don't have to check AVIFILE_USE_QT twice
Should fix pkg/13750 by Matthias Scheler <tron@netbsd.org>
Diffstat (limited to 'graphics/avifile-devel/Makefile')
| -rw-r--r-- | graphics/avifile-devel/Makefile | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile index a39b953661d..323aeaea614 100644 --- a/graphics/avifile-devel/Makefile +++ b/graphics/avifile-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/08/19 06:11:43 zuntum Exp $ +# $NetBSD: Makefile,v 1.14 2001/08/19 08:55:59 zuntum Exp $ # DISTNAME= avifile-0.6.20010814 @@ -13,12 +13,6 @@ COMMENT= MPEG-4 (DivX) video player library DEPENDS+= win32-codecs>=010122:../../graphics/win32-codecs DEPENDS+= automake-*:../../devel/automake -.if defined (WITH_QT) -PLIST_SUBST+= QT='' -.else -PLIST_SUBST+= QT='@comment ' -.endif - WRKSRC= ${WRKDIR}/avifile-0.6 ONLY_FOR_PLATFORM= NetBSD-*-i386 @@ -35,16 +29,31 @@ CXXFLAGS+= -L${BUILDLINK_DIR}/lib -I${BUILDLINK_DIR}/include -I${X11PREFIX}/inc CONFIGURE_ARGS+= --with-win32-path=${LOCALBASE}/lib/win32 CONFIGURE_ARGS+= --disable-dpms +# ffmpeg codec *partially* works, but is incredibly slow so we don't want to use it CONFIGURE_ARGS+= --disable-ffmpeg -.if defined (WITH_QT) -.include "../../x11/qt2-designer/buildlink.mk" +.include "../../mk/bsd.prefs.mk" + +AVIFILE_USE_QT?= NO + +.if defined (AVIFILE_USE_QT) && ${AVIFILE_USE_QT} == "YES" + +# it would be more logical to set PLIST_SRC to PLIST first and then add PLIST.qt to it, +# but @dirrm lib/avifile-0.6 will fail while processing pkg/PLIST, +# because the directory still contains files (they are listed in PLIST.qt) and isn't empty, +# thus can't be removed +PLIST_SRC= ${PKGDIR}/PLIST.qt +PLIST_SRC+= ${PKGDIR}/PLIST + CXXFLAGS+= -Wl,-R${QTDIR}/lib CXXFLAGS+= -Wl,-R${LOCALBASE}/lib CXXFLAGS+= -Wl,-R${X11BASE}/lib CONFIGURE_ARGS+= --enable-qt CONFIGURE_ARGS+= --with-qt-dir="${BUILDLINK_DIR}/qt2" + +.include "../../x11/qt2-designer/buildlink.mk" + .endif pre-configure: |