diff options
| -rw-r--r-- | graphics/avifile-devel/Makefile | 39 | ||||
| -rw-r--r-- | graphics/avifile-devel/distinfo | 5 | ||||
| -rw-r--r-- | graphics/avifile-devel/patches/patch-aa | 10 | ||||
| -rw-r--r-- | graphics/avifile-devel/patches/patch-ab | 12 | ||||
| -rw-r--r-- | graphics/avifile-devel/patches/patch-ac | 12 |
5 files changed, 58 insertions, 20 deletions
diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile index 341dbe5e064..ab84bf354b0 100644 --- a/graphics/avifile-devel/Makefile +++ b/graphics/avifile-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/06/24 02:22:25 zuntum Exp $ +# $NetBSD: Makefile,v 1.5 2001/06/25 14:09:45 zuntum Exp $ # DISTNAME= avifile-0.6.20010618 @@ -13,15 +13,11 @@ COMMENT= MPEG-4 (DivX) video player library DEPENDS+= win32-codecs>=010122:../../graphics/win32-codecs DEPENDS+= SDL>=1.1.2:../../devel/SDL -DEPENDS+= pth>=1.3.7:../../devel/pth DEPENDS+= automake-*:../../devel/automake -SDL_CONFIG?= ${LOCALBASE}/bin/sdl-config - WITH_QT?= NO .if defined (WITH_QT) && ${WITH_QT} == YES -DEPENDS+= qt2-libs>=2.1.0:../../x11/qt2-libs PLIST_SUBST+= QT='' .else PLIST_SUBST+= QT='@comment ' @@ -30,17 +26,17 @@ PLIST_SUBST+= QT='@comment ' WRKSRC= ${WRKDIR}/avifile-0.6 ONLY_FOR_PLATFORM= NetBSD-*-i386 + +USE_X11= yes USE_GMAKE= yes USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= yes -CONFIGURE_ENV+= SDL_CONFIG="${SDL_CONFIG}" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - CXXFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${X11BASE}/lib -Wl,-R${X11BASE}/lib \ - -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" +CONFIGURE_ENV+= SDL_CONFIG="${LOCALBASE}/bin/sdl-config" + +CXXFLAGS+= -L${BUILDLINK_DIR}/lib -I${BUILDLINK_DIR}/include CONFIGURE_ARGS+=--with-win32-path=${LOCALBASE}/lib/win32 \ --enable-sdl \ @@ -48,20 +44,25 @@ CONFIGURE_ARGS+=--with-win32-path=${LOCALBASE}/lib/win32 \ --disable-dpms .if defined (WITH_QT) && ${WITH_QT} == YES -CONFIGURE_ARGS+=--enable-qt \ - --with-qt-dir=${X11BASE}/qt2 \ - --with-qt-includes=${X11BASE}/qt2/include \ - --with-qt-libraries=${X11BASE}/qt2/lib +.include "../../x11/qt2-libs/buildlink.mk" +.include "../../x11/qt2-designer/buildlink.mk" +BUILDLINK_QTDIR= ${BUILDLINK_DIR}/qt2 +QTDIR= ${X11PREFIX}/qt2 + +CXXFLAGS+= -Wl,-R${QTDIR}/lib +CXXFLAGS+= -Wl,-R${LOCALBASE}/lib +CXXFLAGS+= -Wl,-R${X11BASE}/lib -MOC?= ${X11BASE}/qt2/bin/moc -UIC?= ${X11BASE}/qt2/bin/uic +CONFIGURE_ARGS+=--enable-qt +CONFIGURE_ARGS+=--with-qt-dir="${BUILDLINK_DIR}/qt2" -CONFIGURE_ENV+= MOC="${MOC}" \ - UIC="${UIC}" \ - LIBS+="-L${X11BASE}/qt2/lib -Wl,-R${X11BASE}/qt2/lib" +CONFIGURE_ENV+= QTDIR="${BUILDLINK_DIR}/qt2" +CONFIGURE_ENV+= MOC="${BUILDLINK_QTDIR}/bin/moc" +CONFIGURE_ENV+= UIC="${BUILDLINK_QTDIR}/bin/uic" .endif pre-configure: cd ${WRKSRC} && ${SH} autogen.sh +.include "../../devel/pth/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/avifile-devel/distinfo b/graphics/avifile-devel/distinfo index 1dce23b5a4c..e013ceb3066 100644 --- a/graphics/avifile-devel/distinfo +++ b/graphics/avifile-devel/distinfo @@ -1,4 +1,7 @@ - +$NetBSD: distinfo,v 1.3 2001/06/25 14:09:45 zuntum Exp $ SHA1 (avifile-0.6.20010618.tar.bz2) = 7bd6f699ca0f72a48559e8b490322bd2670191e1 Size (avifile-0.6.20010618.tar.bz2) = 788276 bytes +SHA1 (patch-aa) = 462e2f0ca34d5a50ec87f9424b2ec9c84d3b8f6a +SHA1 (patch-ab) = 65c1318ce1798d0e6c25fc0b61dd02be932a74d8 +SHA1 (patch-ac) = ef62129e30cfed2a8494160d18146e4f536ce0fd diff --git a/graphics/avifile-devel/patches/patch-aa b/graphics/avifile-devel/patches/patch-aa new file mode 100644 index 00000000000..ec01c8bf985 --- /dev/null +++ b/graphics/avifile-devel/patches/patch-aa @@ -0,0 +1,10 @@ +$NetBSD: patch-aa,v 1.1 2001/06/25 14:09:46 zuntum Exp $ + +--- lib/common/Makefile.am.orig Thu Jun 7 22:36:21 2001 ++++ lib/common/Makefile.am +@@ -13,4 +13,4 @@ + ldt_keeper.cpp \ + mmx.cpp + +-CXXFLAGS = -g -O2 ++CXXFLAGS+= -g -O2 -I${X11BASE}/include diff --git a/graphics/avifile-devel/patches/patch-ab b/graphics/avifile-devel/patches/patch-ab new file mode 100644 index 00000000000..77ecb060ef6 --- /dev/null +++ b/graphics/avifile-devel/patches/patch-ab @@ -0,0 +1,12 @@ +$NetBSD: patch-ab,v 1.1 2001/06/25 14:09:46 zuntum Exp $ + +--- plugins/libwin32/loader/afl.c.orig Mon May 7 16:53:12 2001 ++++ plugins/libwin32/loader/afl.c +@@ -23,6 +23,7 @@ + + #include <stdio.h> + #include <string.h> ++#include <stdlib.h> + + #include <wine/winbase.h> + #include <wine/windef.h> diff --git a/graphics/avifile-devel/patches/patch-ac b/graphics/avifile-devel/patches/patch-ac new file mode 100644 index 00000000000..ffda21d0a6c --- /dev/null +++ b/graphics/avifile-devel/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1 2001/06/25 14:09:46 zuntum Exp $ + +--- plugins/libwin32/loader/ext.c.orig Sat Jan 27 19:52:10 2001 ++++ plugins/libwin32/loader/ext.c +@@ -5,6 +5,7 @@ + * + * + ********************************************************/ ++#include <stdio.h> + #include <config.h> + #ifdef HAVE_MALLOC_H + #include <malloc.h> |