* [gentoo-commits] proj/gamerlay:master commit in: dev-games/ogre/, media-libs/freeimage/, dev-games/ogre/files/, ...
@ 2012-03-04 8:45 Marcel Unbehaun
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Unbehaun @ 2012-03-04 8:45 UTC (permalink / raw
To: gentoo-commits
commit: f237cbe57d2efef60849cab03ff2dd01c4794f83
Author: Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Sun Mar 4 08:47:13 2012 +0000
Commit: Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Sun Mar 4 08:47:13 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=f237cbe5
[dev-games/ogre] back in portage ogre-1.7.3.ebuild
[media-libs/freeimage] back in portage freeimage-3.15.2.ebuild
---
dev-games/ogre/files/ogre-1.7.3-gcc46.patch | 10 ---
dev-games/ogre/metadata.xml | 25 --------
dev-games/ogre/ogre-1.7.3.ebuild | 85 --------------------------
media-libs/freeimage/files/freeimage.pc.in | 10 ---
media-libs/freeimage/freeimage-3.15.2.ebuild | 83 -------------------------
media-libs/freeimage/metadata.xml | 13 ----
6 files changed, 0 insertions(+), 226 deletions(-)
diff --git a/dev-games/ogre/files/ogre-1.7.3-gcc46.patch b/dev-games/ogre/files/ogre-1.7.3-gcc46.patch
deleted file mode 100644
index 7fe766a..0000000
--- a/dev-games/ogre/files/ogre-1.7.3-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/OgreMain/include/OgreOptimisedUtil.h
-+++ b/OgreMain/include/OgreOptimisedUtil.h
-@@ -29,6 +29,7 @@ Torus Knot Software Ltd.
- #ifndef __OptimisedUtil_H__
- #define __OptimisedUtil_H__
-
-+#include <cstddef>
- #include "OgrePrerequisites.h"
- #include "OgreEdgeListBuilder.h"
-
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
deleted file mode 100644
index b855bb8..0000000
--- a/dev-games/ogre/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>games</herd>
-<maintainer>
-<email>azamat.hackimov@gmail.com</email>
-<name>Azamat H. Hackimov</name>
-</maintainer>
-<longdescription lang="en">
-Object-oriented Graphics Rendering Engine
-</longdescription>
-<use>
- <flag name="boost">Add support for boost</flag>
- <flag name="boost-threads">Build with boost as threads provider</flag>
- <flag name="poco-threads">Build with poco as threads provider</flag>
- <flag name="tbb-threads">Build with tbb as threads provider</flag>
- <flag name="cg">NVIDIA toolkit plugin</flag>
- <flag name="double-precision">more precise calculations at the expense of speed</flag>
- <flag name="ois">OIS plugin</flag>
- <flag name="freeimage">freeimage plugin</flag>
- <flag name="tools">Build Ogre's command line tools</flag>
- <flag name="zip">zip plugin</flag>
-</use>
-</pkgmetadata>
-
diff --git a/dev-games/ogre/ogre-1.7.3.ebuild b/dev-games/ogre/ogre-1.7.3.ebuild
deleted file mode 100644
index 94ccb3a..0000000
--- a/dev-games/ogre/ogre-1.7.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.4.ebuild,v 1.3 2009/12/21 20:44:22 mr_bones_ Exp $
-
-EAPI=3
-inherit multilib eutils cmake-utils
-
-MY_PV="${PV//./-}"
-DESCRIPTION="Object-oriented Graphics Rendering Engine"
-HOMEPAGE="http://www.ogre3d.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+boost +boost-threads doc cg double-precision examples +freeimage +ois +opengl poco-threads test tbb-threads tools +zip"
-RESTRICT="test" #139905
-
-RDEPEND="media-libs/freetype:2
- virtual/opengl
- virtual/glu
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXrandr
- x11-libs/libXt
- boost? ( dev-libs/boost )
- boost-threads? ( dev-libs/boost )
- cg? ( media-gfx/nvidia-cg-toolkit )
- freeimage? ( media-libs/freeimage )
- ois? ( dev-games/ois )
- poco-threads? ( dev-libs/poco )
- tbb-threads? ( dev-cpp/tbb )
- zip? ( sys-libs/zlib dev-libs/zziplib )"
-DEPEND="${RDEPEND}
- x11-proto/xf86vidmodeproto
- dev-util/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )"
-
-S="${WORKDIR}/${PN}_src_v${MY_PV}"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-gcc46.patch"
- if use doc; then
- sed -i -e "s:share/OGRE/docs:share/doc/${P}:" \
- Docs/CMakeLists.txt || die "sed failed"
- fi
-}
-
-src_configure() {
- #-DOGRE_STATIC=ON
- local mycmakeargs="
- -DOGRE_LIB_DIRECTORY="$(get_libdir)"
- $(cmake-utils_use boost OGRE_USE_BOOST)
- $(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
- $(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
- $(cmake-utils_use doc OGRE_INSTALL_DOCS)
- $(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
- $(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
- $(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
- $(cmake-utils_use test OGRE_BUILD_TESTS)
- $(cmake-utils_use tools OGRE_BUILD_TOOLS)
- $(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)"
-
- use cg && [ -d /opt/nvidia-cg-toolkit ] && ogre_dynamic_config+="-DCg_HOME=/opt/nvidia-cg-toolkit"
- use freeimage && LDFLAGS="$LDFLAGS $(pkg-config --libs freeimage)"
-
- if use boost-threads; then
- einfo "Enabling boost as Threading provider"
- mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=ON -DOGRE_CONFIG_THREAD_PROVIDER=\"boost\""
- elif use poco-threads; then
- einfo "Enabling poco as Threading provider"
- mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=ON -DOGRE_CONFIG_THREAD_PROVIDER=\"poco\""
- elif use tbb-threads; then
- einfo "Enabling tbb as Threading provider"
- mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=ON -DOGRE_CONFIG_THREAD_PROVIDER=\"tbb\""
- else
- echo
- ewarn "Threading support is disabled!"
- echo
- mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=OFF"
- fi
- CMAKE_BUILD_TYPE="Release"
- cmake-utils_src_configure
-}
diff --git a/media-libs/freeimage/files/freeimage.pc.in b/media-libs/freeimage/files/freeimage.pc.in
deleted file mode 100644
index 34a6e5a..0000000
--- a/media-libs/freeimage/files/freeimage.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIBDIR@
-
-Name: @PACKAGENAME@
-Description: @DESCRIPTION@
-Version: @VERSION@
-Requires: @REQUIRES@
-Libs: @LIBS@
-Libs.private: @EXTLIBS@
diff --git a/media-libs/freeimage/freeimage-3.15.2.ebuild b/media-libs/freeimage/freeimage-3.15.2.ebuild
deleted file mode 100644
index 6c152da..0000000
--- a/media-libs/freeimage/freeimage-3.15.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-MY_PN=FreeImage
-MY_PV=${PV//.}
-DESCRIPTION="Image library supporting many formats"
-HOMEPAGE="http://freeimage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}${MY_PV}.zip
- doc? ( mirror://sourceforge/${PN}/${MY_PN}${MY_PV}.pdf )
- http://ftp.gentoo.ru/people/winterheart/distfiles/${MY_PN}-${PV}-patches.tar.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 FIPL-1.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cxx doc"
-
-RDEPEND="
- virtual/jpeg
- >=media-libs/libpng-1.5.4
- >=media-libs/tiff-4
- sys-libs/zlib
- media-libs/openjpeg
- media-libs/openexr"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-S=${WORKDIR}/${MY_PN}
-
-src_prepare() {
- append-cflags -std=c99 -D_POSIX_SOURCE # silence warnings from gcc
- EPATCH_SOURCE="${WORKDIR}/${MY_PN}-${PV}-patches" EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" epatch
-}
-
-src_compile() {
- emake -f Makefile.gnu || die "emake failed"
- if use cxx ; then
- emake -f Makefile.fip || die "emake fip failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" INSTALLDIR="${D}/usr/$(get_libdir)" \
- -f Makefile.gnu install || die
- if use cxx ; then
- emake DESTDIR="${D}" INSTALLDIR="${D}/usr/$(get_libdir)" \
- -f Makefile.fip install
- fi
- dodoc README.linux Whatsnew.txt
- use doc && dodoc "${DISTDIR}"/${MY_P}.pdf
-
- ebegin "Installing pkg-config file"
- dodir /usr/$(get_libdir)/pkgconfig
- sed \
- -e "s:@LIBDIR@:$(get_libdir):" \
- -e "s:@PACKAGENAME@:${MY_PN}:" \
- -e "s:@DESCRIPTION@:${DESCRIPTION}:" \
- -e "s:@REQUIRES@:OpenEXR libpng:" \
- -e "s:@VERSION@:${PV}:" \
- -e "s:@LIBS@:-lfreeimage:" \
- -e "s:@EXTLIBS@:-ljpeg -ltiff -lopenjpeg -lz:" \
- "${FILESDIR}/${PN}.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc" || die
- PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists ${PN} \
- || die ".pc file failed to validate."
- if use cxx ; then
- sed \
- -e "s:@LIBDIR@:$(get_libdir):" \
- -e "s:@PACKAGENAME@:${MY_PN}:" \
- -e "s:@DESCRIPTION@:${DESCRIPTION}:" \
- -e "s:@REQUIRES@:OpenEXR libpng:" \
- -e "s:@VERSION@:${PV}:" \
- -e "s:@LIBS@:-lfreeimageplus:" \
- -e "s:@EXTLIBS@:-ljpeg -ltiff -lopenjpeg -lz:" \
- "${FILESDIR}/${PN}.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/${PN}plus.pc" || die
- fi
- PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists ${PN}plus \
- || die ".pc file failed to validate."
- eend $?
-}
diff --git a/media-libs/freeimage/metadata.xml b/media-libs/freeimage/metadata.xml
deleted file mode 100644
index c215ce4..0000000
--- a/media-libs/freeimage/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>games</herd>
-<maintainer>
-<email>azamat.hackimov@gmail.com</email>
-<name>Azamat H. Hackimov</name>
-</maintainer>
-<longdescription lang="en">
-Image library supporting many formats
-</longdescription>
-</pkgmetadata>
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/ogre/, media-libs/freeimage/, dev-games/ogre/files/, ...
@ 2012-03-05 12:23 Azamat H. Hackimov
0 siblings, 0 replies; 2+ messages in thread
From: Azamat H. Hackimov @ 2012-03-05 12:23 UTC (permalink / raw
To: gentoo-commits
commit: 1fde6ba642d3c0348129f2659e640235233f7a95
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Mon Mar 5 12:19:02 2012 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Mon Mar 5 12:19:02 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=1fde6ba6
Revert "[dev-games/ogre] back in portage ogre-1.7.3.ebuild"
FreeImage is newer than in portage and use different patchstack.
Ogre needed to review additionaly.
This reverts commit f237cbe57d2efef60849cab03ff2dd01c4794f83.
---
dev-games/ogre/files/ogre-1.7.3-gcc46.patch | 10 +++
dev-games/ogre/metadata.xml | 25 ++++++++
dev-games/ogre/ogre-1.7.3.ebuild | 85 ++++++++++++++++++++++++++
media-libs/freeimage/files/freeimage.pc.in | 10 +++
media-libs/freeimage/freeimage-3.15.2.ebuild | 83 +++++++++++++++++++++++++
media-libs/freeimage/metadata.xml | 13 ++++
6 files changed, 226 insertions(+), 0 deletions(-)
diff --git a/dev-games/ogre/files/ogre-1.7.3-gcc46.patch b/dev-games/ogre/files/ogre-1.7.3-gcc46.patch
new file mode 100644
index 0000000..7fe766a
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.7.3-gcc46.patch
@@ -0,0 +1,10 @@
+--- a/OgreMain/include/OgreOptimisedUtil.h
++++ b/OgreMain/include/OgreOptimisedUtil.h
+@@ -29,6 +29,7 @@ Torus Knot Software Ltd.
+ #ifndef __OptimisedUtil_H__
+ #define __OptimisedUtil_H__
+
++#include <cstddef>
+ #include "OgrePrerequisites.h"
+ #include "OgreEdgeListBuilder.h"
+
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
new file mode 100644
index 0000000..b855bb8
--- /dev/null
+++ b/dev-games/ogre/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+<maintainer>
+<email>azamat.hackimov@gmail.com</email>
+<name>Azamat H. Hackimov</name>
+</maintainer>
+<longdescription lang="en">
+Object-oriented Graphics Rendering Engine
+</longdescription>
+<use>
+ <flag name="boost">Add support for boost</flag>
+ <flag name="boost-threads">Build with boost as threads provider</flag>
+ <flag name="poco-threads">Build with poco as threads provider</flag>
+ <flag name="tbb-threads">Build with tbb as threads provider</flag>
+ <flag name="cg">NVIDIA toolkit plugin</flag>
+ <flag name="double-precision">more precise calculations at the expense of speed</flag>
+ <flag name="ois">OIS plugin</flag>
+ <flag name="freeimage">freeimage plugin</flag>
+ <flag name="tools">Build Ogre's command line tools</flag>
+ <flag name="zip">zip plugin</flag>
+</use>
+</pkgmetadata>
+
diff --git a/dev-games/ogre/ogre-1.7.3.ebuild b/dev-games/ogre/ogre-1.7.3.ebuild
new file mode 100644
index 0000000..94ccb3a
--- /dev/null
+++ b/dev-games/ogre/ogre-1.7.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.4.ebuild,v 1.3 2009/12/21 20:44:22 mr_bones_ Exp $
+
+EAPI=3
+inherit multilib eutils cmake-utils
+
+MY_PV="${PV//./-}"
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="http://www.ogre3d.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost +boost-threads doc cg double-precision examples +freeimage +ois +opengl poco-threads test tbb-threads tools +zip"
+RESTRICT="test" #139905
+
+RDEPEND="media-libs/freetype:2
+ virtual/opengl
+ virtual/glu
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXrandr
+ x11-libs/libXt
+ boost? ( dev-libs/boost )
+ boost-threads? ( dev-libs/boost )
+ cg? ( media-gfx/nvidia-cg-toolkit )
+ freeimage? ( media-libs/freeimage )
+ ois? ( dev-games/ois )
+ poco-threads? ( dev-libs/poco )
+ tbb-threads? ( dev-cpp/tbb )
+ zip? ( sys-libs/zlib dev-libs/zziplib )"
+DEPEND="${RDEPEND}
+ x11-proto/xf86vidmodeproto
+ dev-util/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )"
+
+S="${WORKDIR}/${PN}_src_v${MY_PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-gcc46.patch"
+ if use doc; then
+ sed -i -e "s:share/OGRE/docs:share/doc/${P}:" \
+ Docs/CMakeLists.txt || die "sed failed"
+ fi
+}
+
+src_configure() {
+ #-DOGRE_STATIC=ON
+ local mycmakeargs="
+ -DOGRE_LIB_DIRECTORY="$(get_libdir)"
+ $(cmake-utils_use boost OGRE_USE_BOOST)
+ $(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
+ $(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
+ $(cmake-utils_use doc OGRE_INSTALL_DOCS)
+ $(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
+ $(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
+ $(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
+ $(cmake-utils_use test OGRE_BUILD_TESTS)
+ $(cmake-utils_use tools OGRE_BUILD_TOOLS)
+ $(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)"
+
+ use cg && [ -d /opt/nvidia-cg-toolkit ] && ogre_dynamic_config+="-DCg_HOME=/opt/nvidia-cg-toolkit"
+ use freeimage && LDFLAGS="$LDFLAGS $(pkg-config --libs freeimage)"
+
+ if use boost-threads; then
+ einfo "Enabling boost as Threading provider"
+ mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=ON -DOGRE_CONFIG_THREAD_PROVIDER=\"boost\""
+ elif use poco-threads; then
+ einfo "Enabling poco as Threading provider"
+ mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=ON -DOGRE_CONFIG_THREAD_PROVIDER=\"poco\""
+ elif use tbb-threads; then
+ einfo "Enabling tbb as Threading provider"
+ mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=ON -DOGRE_CONFIG_THREAD_PROVIDER=\"tbb\""
+ else
+ echo
+ ewarn "Threading support is disabled!"
+ echo
+ mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=OFF"
+ fi
+ CMAKE_BUILD_TYPE="Release"
+ cmake-utils_src_configure
+}
diff --git a/media-libs/freeimage/files/freeimage.pc.in b/media-libs/freeimage/files/freeimage.pc.in
new file mode 100644
index 0000000..34a6e5a
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage.pc.in
@@ -0,0 +1,10 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@LIBDIR@
+
+Name: @PACKAGENAME@
+Description: @DESCRIPTION@
+Version: @VERSION@
+Requires: @REQUIRES@
+Libs: @LIBS@
+Libs.private: @EXTLIBS@
diff --git a/media-libs/freeimage/freeimage-3.15.2.ebuild b/media-libs/freeimage/freeimage-3.15.2.ebuild
new file mode 100644
index 0000000..6c152da
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.15.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit eutils flag-o-matic toolchain-funcs multilib
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="http://freeimage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}${MY_PV}.zip
+ doc? ( mirror://sourceforge/${PN}/${MY_PN}${MY_PV}.pdf )
+ http://ftp.gentoo.ru/people/winterheart/distfiles/${MY_PN}-${PV}-patches.tar.bz2"
+
+LICENSE="|| ( GPL-2 GPL-3 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cxx doc"
+
+RDEPEND="
+ virtual/jpeg
+ >=media-libs/libpng-1.5.4
+ >=media-libs/tiff-4
+ sys-libs/zlib
+ media-libs/openjpeg
+ media-libs/openexr"
+DEPEND="${RDEPEND}
+ app-arch/unzip"
+
+S=${WORKDIR}/${MY_PN}
+
+src_prepare() {
+ append-cflags -std=c99 -D_POSIX_SOURCE # silence warnings from gcc
+ EPATCH_SOURCE="${WORKDIR}/${MY_PN}-${PV}-patches" EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" epatch
+}
+
+src_compile() {
+ emake -f Makefile.gnu || die "emake failed"
+ if use cxx ; then
+ emake -f Makefile.fip || die "emake fip failed"
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" INSTALLDIR="${D}/usr/$(get_libdir)" \
+ -f Makefile.gnu install || die
+ if use cxx ; then
+ emake DESTDIR="${D}" INSTALLDIR="${D}/usr/$(get_libdir)" \
+ -f Makefile.fip install
+ fi
+ dodoc README.linux Whatsnew.txt
+ use doc && dodoc "${DISTDIR}"/${MY_P}.pdf
+
+ ebegin "Installing pkg-config file"
+ dodir /usr/$(get_libdir)/pkgconfig
+ sed \
+ -e "s:@LIBDIR@:$(get_libdir):" \
+ -e "s:@PACKAGENAME@:${MY_PN}:" \
+ -e "s:@DESCRIPTION@:${DESCRIPTION}:" \
+ -e "s:@REQUIRES@:OpenEXR libpng:" \
+ -e "s:@VERSION@:${PV}:" \
+ -e "s:@LIBS@:-lfreeimage:" \
+ -e "s:@EXTLIBS@:-ljpeg -ltiff -lopenjpeg -lz:" \
+ "${FILESDIR}/${PN}.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc" || die
+ PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists ${PN} \
+ || die ".pc file failed to validate."
+ if use cxx ; then
+ sed \
+ -e "s:@LIBDIR@:$(get_libdir):" \
+ -e "s:@PACKAGENAME@:${MY_PN}:" \
+ -e "s:@DESCRIPTION@:${DESCRIPTION}:" \
+ -e "s:@REQUIRES@:OpenEXR libpng:" \
+ -e "s:@VERSION@:${PV}:" \
+ -e "s:@LIBS@:-lfreeimageplus:" \
+ -e "s:@EXTLIBS@:-ljpeg -ltiff -lopenjpeg -lz:" \
+ "${FILESDIR}/${PN}.pc.in" > "${D}/usr/$(get_libdir)/pkgconfig/${PN}plus.pc" || die
+ fi
+ PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists ${PN}plus \
+ || die ".pc file failed to validate."
+ eend $?
+}
diff --git a/media-libs/freeimage/metadata.xml b/media-libs/freeimage/metadata.xml
new file mode 100644
index 0000000..c215ce4
--- /dev/null
+++ b/media-libs/freeimage/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>games</herd>
+<maintainer>
+<email>azamat.hackimov@gmail.com</email>
+<name>Azamat H. Hackimov</name>
+</maintainer>
+<longdescription lang="en">
+Image library supporting many formats
+</longdescription>
+</pkgmetadata>
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-05 12:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-04 8:45 [gentoo-commits] proj/gamerlay:master commit in: dev-games/ogre/, media-libs/freeimage/, dev-games/ogre/files/, Marcel Unbehaun
-- strict thread matches above, loose matches on Subject: below --
2012-03-05 12:23 Azamat H. Hackimov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox