* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-opengl: qt-opengl-4.4.0_rc1.ebuild
@ 2007-12-20 22:07 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2007-12-20 22:07 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 07/12/20 22:07:27
Modified: qt-opengl-4.4.0_rc1.ebuild
Log:
whitespace
(Portage version: 2.1.3.19)
Revision Changes Path
1.2 x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?r1=1.1&r2=1.2
Index: qt-opengl-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qt-opengl-4.4.0_rc1.ebuild 20 Dec 2007 16:33:02 -0000 1.1
+++ qt-opengl-4.4.0_rc1.ebuild 20 Dec 2007 22:07:26 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.1 2007/12/20 16:33:02 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.2 2007/12/20 22:07:26 mr_bones_ Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -136,4 +136,3 @@
# Need to add opengl to QT_CONFIG line
sed -i -e "s:opengl ::g" ${QTDATADIR}/mkspecs/qconfig.pri
}
-
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-opengl: qt-opengl-4.4.0_rc1.ebuild
@ 2007-12-21 19:14 Caleb Tennis (caleb)
0 siblings, 0 replies; 6+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-21 19:14 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/21 19:14:31
Modified: qt-opengl-4.4.0_rc1.ebuild
Log:
Revised to use qt4-build eclass
(Portage version: 2.1.3.16)
Revision Changes Path
1.3 x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?r1=1.2&r2=1.3
Index: qt-opengl-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-opengl-4.4.0_rc1.ebuild 20 Dec 2007 22:07:26 -0000 1.2
+++ qt-opengl-4.4.0_rc1.ebuild 21 Dec 2007 19:14:31 -0000 1.3
@@ -1,11 +1,11 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.2 2007/12/20 22:07:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.3 2007/12/21 19:14:31 caleb Exp $
-inherit eutils flag-o-matic toolchain-funcs multilib
+inherit qt4-build
SRCTYPE="preview-opensource-src"
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework."
+DESCRIPTION="The OpenGL module for the Qt toolkit."
HOMEPAGE="http://www.trolltech.com/"
MY_PV=${PV/_rc/-tp}
@@ -19,120 +19,49 @@
IUSE="debug"
-RDEPEND="=x11-libs/qt-4.4.0_rc1
+RDEPEND="~x11-libs/qt-gui-4.4.0_rc1
( virtual/opengl virtual/glu )"
DEPEND="${RDEPEND}"
-pkg_setup() {
- QTBASEDIR=/usr/$(get_libdir)/qt4
- QTPREFIXDIR=/usr
- QTBINDIR=/usr/bin
- QTLIBDIR=/usr/$(get_libdir)/qt4
- QTPCDIR=/usr/$(get_libdir)/pkgconfig
- QTDATADIR=/usr/share/qt4
- QTDOCDIR=/usr/share/doc/${PF}
- QTHEADERDIR=/usr/include/qt4
- QTPLUGINDIR=${QTLIBDIR}/plugins
- QTSYSCONFDIR=/etc/qt4
- QTTRANSDIR=${QTDATADIR}/translations
- QTEXAMPLESDIR=${QTDATADIR}/examples
- QTDEMOSDIR=${QTDATADIR}/demos
-}
-
src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Don't let the user go too overboard with flags. If you really want to, uncomment
- # out the line below and give 'er a whirl.
- strip-flags
- replace-flags -O3 -O2
-
- if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then
- ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS"
- append-flags -fno-stack-protector
- fi
-
- # Override the creation of qmake and copy over the one from the system. This speeds up compilation time a lot.
- epatch "${FILESDIR}"/configure.patch
- cp ${QTBINDIR}/qmake "${S}"/bin/qmake
+ qt4-build_src_unpack
+ skip_qmake_build_patch
+ skip_project_generation_patch
+ install_binaries_to_buildtree
}
src_compile() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)"
+ local myconf=$(standard_configure_options)
+ myconf="${myconf} -opengl"
- # Disable visibility explicitly if gcc version isn't 4
- if [[ "$(gcc-major-version)" != "4" ]]; then
- myconf="${myconf} -no-reduce-exports"
+ if built_with_use ~x11-libs/qt-core-${PV} qt3support; then
+ myconf="${myconf} -qt3support"
+ else
+ myconf="${myconf} -no-qt3support"
fi
- # Add a switch that will attempt to use recent binutils to reduce relocations. Should be harmless for other
- # cases. From bug #178535
- myconf="${myconf} -fast -reduce-relocations -opengl"
- use debug && myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info"
-
- myconf="${myconf} -nomake examples -nomake demos"
-
- myconf="-stl -verbose -largefile -confirm-license \
- -no-rpath \
- -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
- -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \
- -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \
- -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf}"
-
echo ./configure ${myconf}
./configure ${myconf} || die
- # Edit the .qmake.cache file
- sed -i -e "s:QMAKE_MOC:\#QMAKE_MOC:g" "${S}"/.qmake.cache
- sed -i -e "s:QMAKE_UIC:\#QMAKE_UIC:g" "${S}"/.qmake.cache
- sed -i -e "s:QMAKE_RCC:\#QMAKE_RCC:g" "${S}"/.qmake.cache
-
- cd "${S}"/src/opengl
- qmake "LIBS+=-L${QTLIBDIR}" && emake || die
-
- # Currently commented out of the TT's Qt build
- # cd "${S}"/tools/designer/src/plugins/tools/view3d
- # qmake "LIBS+=-L${QTLIBDIR}" && emake || die
+ build_directories src/opengl
+ # Not building tools/designer/src/plugins/tools/view3d as it's commented out of the build in the source
}
src_install() {
- export PATH="${S}/bin:${PATH}"
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}"
-
- cd "${S}"/src/opengl
- emake INSTALL_ROOT="${D}" install || die
-
- # cd "${S}"/tools/designer/src/plugins/tools/view3d
- # emake INSTALL_ROOT="${D}" install || die
-
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.la
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.prl
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
-
- # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix:
- sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc
+ install_directories src/opengl
- # Move .pc files into the pkgconfig directory
- dodir ${QTPCDIR}
- mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR}
+ fix_library_files
}
pkg_postinst()
{
- # Need to add opengl to QT_CONFIG line
- sed -i -e "s:opengl ::g" ${QTDATADIR}/mkspecs/qconfig.pri
- sed -i -e "s:QT_CONFIG += :QT_CONFIG += opengl :g" ${QTDATADIR}/mkspecs/qconfig.pri
+ qconfig_add_option opengl
}
pkg_postrm()
{
- # Need to add opengl to QT_CONFIG line
- sed -i -e "s:opengl ::g" ${QTDATADIR}/mkspecs/qconfig.pri
+ qconfig_remove_option opengl
}
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-opengl: qt-opengl-4.4.0_rc1.ebuild
@ 2007-12-21 20:01 Caleb Tennis (caleb)
0 siblings, 0 replies; 6+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-21 20:01 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/21 20:01:42
Modified: qt-opengl-4.4.0_rc1.ebuild
Log:
version dep fix
(Portage version: 2.1.3.16)
Revision Changes Path
1.4 x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?r1=1.3&r2=1.4
Index: qt-opengl-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qt-opengl-4.4.0_rc1.ebuild 21 Dec 2007 19:14:31 -0000 1.3
+++ qt-opengl-4.4.0_rc1.ebuild 21 Dec 2007 20:01:42 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.3 2007/12/21 19:14:31 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.4 2007/12/21 20:01:42 caleb Exp $
inherit qt4-build
@@ -19,7 +19,7 @@
IUSE="debug"
-RDEPEND="~x11-libs/qt-gui-4.4.0_rc1
+RDEPEND="~x11-libs/qt-gui-${PV}
( virtual/opengl virtual/glu )"
DEPEND="${RDEPEND}"
@@ -65,3 +65,4 @@
{
qconfig_remove_option opengl
}
+
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-opengl: qt-opengl-4.4.0_rc1.ebuild
@ 2007-12-21 20:05 Caleb Tennis (caleb)
0 siblings, 0 replies; 6+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-21 20:05 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/21 20:05:07
Modified: qt-opengl-4.4.0_rc1.ebuild
Log:
use flag fix
(Portage version: 2.1.3.16)
Revision Changes Path
1.5 x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?r1=1.4&r2=1.5
Index: qt-opengl-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt-opengl-4.4.0_rc1.ebuild 21 Dec 2007 20:01:42 -0000 1.4
+++ qt-opengl-4.4.0_rc1.ebuild 21 Dec 2007 20:05:07 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.4 2007/12/21 20:01:42 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.5 2007/12/21 20:05:07 caleb Exp $
inherit qt4-build
@@ -17,8 +17,6 @@
SLOT="4"
KEYWORDS="~x86"
-IUSE="debug"
-
RDEPEND="~x11-libs/qt-gui-${PV}
( virtual/opengl virtual/glu )"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-opengl: qt-opengl-4.4.0_rc1.ebuild
@ 2007-12-21 22:37 Michael Sterrett (mr_bones_)
0 siblings, 0 replies; 6+ messages in thread
From: Michael Sterrett (mr_bones_) @ 2007-12-21 22:37 UTC (permalink / raw
To: gentoo-commits
mr_bones_ 07/12/21 22:37:57
Modified: qt-opengl-4.4.0_rc1.ebuild
Log:
whitespace
(Portage version: 2.1.3.19)
Revision Changes Path
1.6 x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?r1=1.5&r2=1.6
Index: qt-opengl-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qt-opengl-4.4.0_rc1.ebuild 21 Dec 2007 20:05:07 -0000 1.5
+++ qt-opengl-4.4.0_rc1.ebuild 21 Dec 2007 22:37:56 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.5 2007/12/21 20:05:07 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.6 2007/12/21 22:37:56 mr_bones_ Exp $
inherit qt4-build
@@ -63,4 +63,3 @@
{
qconfig_remove_option opengl
}
-
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-libs/qt-opengl: qt-opengl-4.4.0_rc1.ebuild
@ 2007-12-22 18:18 Caleb Tennis (caleb)
0 siblings, 0 replies; 6+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-22 18:18 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/22 18:18:40
Modified: qt-opengl-4.4.0_rc1.ebuild
Log:
Use new eclass functions
(Portage version: 2.1.3.16)
Revision Changes Path
1.7 x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild?r1=1.6&r2=1.7
Index: qt-opengl-4.4.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qt-opengl-4.4.0_rc1.ebuild 21 Dec 2007 22:37:56 -0000 1.6
+++ qt-opengl-4.4.0_rc1.ebuild 22 Dec 2007 18:18:39 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.6 2007/12/21 22:37:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/qt-opengl-4.4.0_rc1.ebuild,v 1.7 2007/12/22 18:18:39 caleb Exp $
inherit qt4-build
@@ -22,6 +22,8 @@
DEPEND="${RDEPEND}"
+QT4_TARGET_DIRECTORIES="src/opengl"
+
src_unpack() {
qt4-build_src_unpack
@@ -44,14 +46,9 @@
echo ./configure ${myconf}
./configure ${myconf} || die
- build_directories src/opengl
- # Not building tools/designer/src/plugins/tools/view3d as it's commented out of the build in the source
-}
+ build_target_directories
-src_install() {
- install_directories src/opengl
-
- fix_library_files
+ # Not building tools/designer/src/plugins/tools/view3d as it's commented out of the build in the source
}
pkg_postinst()
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-12-22 18:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-20 22:07 [gentoo-commits] gentoo-x86 commit in x11-libs/qt-opengl: qt-opengl-4.4.0_rc1.ebuild Michael Sterrett (mr_bones_)
-- strict thread matches above, loose matches on Subject: below --
2007-12-21 19:14 Caleb Tennis (caleb)
2007-12-21 20:01 Caleb Tennis (caleb)
2007-12-21 20:05 Caleb Tennis (caleb)
2007-12-21 22:37 Michael Sterrett (mr_bones_)
2007-12-22 18:18 Caleb Tennis (caleb)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox