Modular Xorg support for Qt.
This commit is contained in:
parent
dd2565be8c
commit
1eb1d87057
4 changed files with 16 additions and 7 deletions
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.58 2006/12/15 20:33:04 joerg Exp $
|
||||
# $NetBSD: Makefile,v 1.59 2007/01/10 10:16:01 joerg Exp $
|
||||
|
||||
PKGNAME= qt3-libs-${QTVERSION}
|
||||
MAINTAINER= adam@NetBSD.org
|
||||
|
@ -61,6 +61,7 @@ SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/'
|
|||
.include "../../graphics/mng/buildlink3.mk"
|
||||
.include "../../graphics/png/buildlink3.mk"
|
||||
.include "../../graphics/freetype2/buildlink3.mk"
|
||||
.include "../../x11/libSM/buildlink3.mk"
|
||||
.include "../../x11/libXcursor/buildlink3.mk"
|
||||
.include "../../x11/libXft/buildlink3.mk"
|
||||
.include "../../x11/libXrandr/buildlink3.mk"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile.common,v 1.61 2006/07/26 13:30:24 joerg Exp $
|
||||
# $NetBSD: Makefile.common,v 1.62 2007/01/10 10:16:01 joerg Exp $
|
||||
|
||||
DISTNAME= qt-x11-free-${QTVERSION}
|
||||
CATEGORIES= x11
|
||||
|
@ -72,7 +72,9 @@ CONFIGURE_ARGS+= -verbose
|
|||
|
||||
QMAKE_RANLIB?= ${TRUE}
|
||||
|
||||
.if !exists(${X11BASE}/lib/libXinerama.so) && \
|
||||
.if ${X11_TYPE} == "modular"
|
||||
.include "../../x11/libXinerama/buildlink3.mk"
|
||||
.elif !exists(${X11BASE}/lib/libXinerama.so) && \
|
||||
!exists(${X11BASE}/lib/libXinerama.dylib)
|
||||
CONFIGURE_ARGS+= -no-xinerama
|
||||
.endif
|
||||
|
@ -108,8 +110,6 @@ INSTALL_UNSTRIPPED= yes
|
|||
CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline
|
||||
.endif
|
||||
|
||||
.include "../../mk/x11.buildlink3.mk"
|
||||
|
||||
pre-configure:
|
||||
${SED} \
|
||||
-e 's:@LOCALBASE@:${LOCALBASE}:g' \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: buildlink3.mk,v 1.19 2006/12/15 20:33:04 joerg Exp $
|
||||
# $NetBSD: buildlink3.mk,v 1.20 2007/01/10 10:16:01 joerg Exp $
|
||||
|
||||
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
|
||||
QT3_LIBS_BUILDLINK3_MK:= ${QT3_LIBS_BUILDLINK3_MK}+
|
||||
|
@ -23,6 +23,8 @@ BUILDLINK_LIBDIRS.qt3-libs+= qt3/lib
|
|||
QTDIR= ${BUILDLINK_PREFIX.qt3-libs}/qt3
|
||||
BUILDLINK_PASSTHRU_DIRS+= ${QTDIR}
|
||||
|
||||
.include "../../mk/bsd.fast.prefs.mk"
|
||||
|
||||
PTHREAD_OPTS+= require
|
||||
|
||||
.include "../../devel/zlib/buildlink3.mk"
|
||||
|
@ -32,9 +34,13 @@ PTHREAD_OPTS+= require
|
|||
.include "../../graphics/mng/buildlink3.mk"
|
||||
.include "../../graphics/png/buildlink3.mk"
|
||||
.include "../../graphics/freetype2/buildlink3.mk"
|
||||
.include "../../x11/libSM/buildlink3.mk"
|
||||
.include "../../x11/libXcursor/buildlink3.mk"
|
||||
.include "../../x11/libXft/buildlink3.mk"
|
||||
.include "../../x11/libXrandr/buildlink3.mk"
|
||||
.if ${X11_TYPE} == "modular"
|
||||
.include "../../x11/libXinerama/buildlink3.mk"
|
||||
.endif
|
||||
.include "../../mk/pthread.buildlink3.mk"
|
||||
|
||||
CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.50 2006/10/23 14:54:11 adam Exp $
|
||||
# $NetBSD: Makefile,v 1.51 2007/01/10 10:16:01 joerg Exp $
|
||||
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
# XXX: hack - work round an ICE with GCC 3.3 on sparc
|
||||
|
@ -46,5 +46,7 @@ do-install:
|
|||
cd ${WRKSRC}/mkspecs && ${PAX} -rw . ${QTPREFIX}/mkspecs
|
||||
|
||||
.include "../../converters/libiconv/buildlink3.mk"
|
||||
# For OpenGL linkage, really needed?
|
||||
.include "../../x11/libXmu/buildlink3.mk"
|
||||
.include "../../x11/qt3-libs/buildlink3.mk"
|
||||
.include "../../mk/bsd.pkg.mk"
|
||||
|
|
Loading…
Reference in a new issue