summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven J Newbury <steve@snewbury.org.uk>2009-05-17 11:30:34 +0100
committerSteven J Newbury <steve@snewbury.org.uk>2009-05-17 11:30:34 +0100
commit757438af5d8cd945d764306f2dfcd5e50f401acb (patch)
treeaed803c9d10ea096a4bce1f7ecc6576f64d03637 /media-libs
parentUpdate manifest (diff)
parentx11-libs/libdrm and media-libs/mesa version bump (diff)
downloadmultilib-portage-757438af5d8cd945d764306f2dfcd5e50f401acb.tar.gz
multilib-portage-757438af5d8cd945d764306f2dfcd5e50f401acb.tar.bz2
multilib-portage-757438af5d8cd945d764306f2dfcd5e50f401acb.zip
Merge branch 'master' of git@github.com:sjnewbury/multilib-overlay
Conflicts: dev-libs/icu/Manifest dev-libs/icu/icu-4.2.ebuild gnome-base/gnome-keyring/Manifest gnome-base/gnome-keyring/gnome-keyring-2.26.1-r1.ebuild media-libs/gst-plugins-base/Manifest media-libs/gst-plugins-base/gst-plugins-base-0.10.23.ebuild media-libs/gstreamer/Manifest media-libs/gstreamer/gstreamer-0.10.23.ebuild sys-apps/hal/Manifest sys-apps/hal/hal-0.5.12_rc1-r4.ebuild
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libpng/Manifest2
-rw-r--r--media-libs/libpng/libpng-1.2.36.ebuild5
-rw-r--r--media-libs/mesa/Manifest2
-rw-r--r--media-libs/mesa/mesa-7.4.2.ebuild277
4 files changed, 281 insertions, 5 deletions
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index cc9fa8fcc..37c03ec5e 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -4,6 +4,6 @@ DIST libpng-1.2.35.tar.lzma 514777 RMD160 9566efec8770ac7c816e268fc2ef4a60960029
DIST libpng-1.2.36.tar.lzma 516736 RMD160 9435c8abbd5317e8b326d2695a799ee2bf70ec7b SHA1 2a36983ff74f6b13db45eace692f4b3ec5f684cb SHA256 5df30d36cedec2ad1cf33a07db796c9c79abb39bad443f42bef6a9b28cccc9b6
EBUILD libpng-1.2.34.ebuild 1201 RMD160 4153df7800ee596e696add79e897a89e2265f4c1 SHA1 3dd38d08aff9c0af56db42d3fbecc6ed62f28b62 SHA256 198a9169a146887c80ea418657a783f40f40bd8c2f09e1abbdc7d478fc6cacbc
EBUILD libpng-1.2.35.ebuild 1202 RMD160 ceceb18c400ffac6a5c69dddcd469fd08b89ea0c SHA1 9135fa20fde8dd713a36380f6f057aba4c85b685 SHA256 30a8cfbbdb4ad47321e15c6fb583daaec4a942028df125e451fbae030cb59ee6
-EBUILD libpng-1.2.36.ebuild 894 RMD160 f046edf1e3d6436f8e508915cf5e99e86dddc041 SHA1 d2edc6c7af3ce7e6db6540f0916c72f5bc569561 SHA256 51ad75bc19a4158c559007bb97cb2ab2e148c155fd6ae774a4e67310f436c3fa
+EBUILD libpng-1.2.36.ebuild 868 RMD160 b144204b2f693b1ece8a3b9728ac5b849a656a16 SHA1 539f3b3e49e6d1401bc33e4e321d75af16f9bae6 SHA256 2a1312d5f6d7b86087e45173d543a2add51c8054dd42a3e0b90135820324ce2b
MISC ChangeLog 29278 RMD160 76cd55deb089f4d3bb3eda3706eacd5e440022bb SHA1 771063cc068eac5aaab7490ac08a3f92f7221521 SHA256 b557cf097bc5b17ee1476e96bf4a15205d5041ae1c6a870b655383c92da39cf8
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/media-libs/libpng/libpng-1.2.36.ebuild b/media-libs/libpng/libpng-1.2.36.ebuild
index 5f721e10f..52d2ae4e7 100644
--- a/media-libs/libpng/libpng-1.2.36.ebuild
+++ b/media-libs/libpng/libpng-1.2.36.ebuild
@@ -6,10 +6,9 @@ EAPI="2"
inherit libtool multilib eutils multilib-native
-MY_PV=${PV/_}
DESCRIPTION="Portable Network Graphics library"
HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/libpng/${PN}-${MY_PV}.tar.lzma"
+SRC_URI="mirror://sourceforge/libpng/${P}.tar.lzma"
LICENSE="as-is"
SLOT="1.2"
@@ -23,13 +22,11 @@ DEPEND="${RDEPEND}
src_unpack() {
unpack ${A}
cd "${S}"
-
# So we get sane .so versioning on FreeBSD
elibtoolize
}
multilib-native_src_install_internal() {
emake DESTDIR="${D}" install || die
-
dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index f22fe1173..b02949a99 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -8,6 +8,7 @@ DIST MesaLib-7.3.tar.bz2 3368281 RMD160 ee0b06d375d1ea91dc26ae96c807918e1d3cb7c8
DIST MesaLib-7.4-rc1.tar.gz 4441158 RMD160 931a282d01b30522697377567eceb1e32e1f1040 SHA1 a43fc2563ef190b4dba17afd2c22fa676e9cc80f SHA256 caf32570cd55b8fdd86bf837536996a309add977e084cae4b4c95422f77d9321
DIST MesaLib-7.4-rc2.tar.gz 4443420 RMD160 79c874081bbba8d455d688e93382122a015f24c3 SHA1 1c60ccaf1ea1c69598d183e7808444180c85048b SHA256 9004390f98ff890f8dc3214a4dfb76bb26531f08bc55517de284455dd0a4831c
DIST MesaLib-7.4.1.tar.bz2 3373554 RMD160 6a178359f26f54198e17d22c12f396940abb2b18 SHA1 ee3f8baa48fa31441fc07ccd06734279cb1ca18a SHA256 cba38fc0f6896757cb6e3962d3bb091d3d724a536a213ab9cf6b00a760efc5d2
+DIST MesaLib-7.4.2.tar.bz2 3371577 RMD160 e70b8fd203325e676d90485632bf266e39d46a7e SHA1 fe70945ccf2c08d18ae4e83000018f0400352065 SHA256 71b978812cfc0dbc378315de42ef44a32f171b4166733b18455ec04a7fbc6434
DIST MesaLib-7.4.tar.bz2 3370157 RMD160 a3e601a5fbb482b4d9668d88a33592ea180170d5 SHA1 66b5fe185e63706ee2a76e247fd982fdf13972e2 SHA256 6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4
DIST mesa-7.3-gentoo-patches-01.tar.bz2 34342 RMD160 547e3d1e8a72cd7df13bf699c181a5f8d36bff33 SHA1 51310d802ad1ee8b660fc7cf77c37b5478f3794a SHA256 e3d27046f73b6fc3d89e06fdfce9d065fa79705f59950b65350fa55bd539e56a
DIST mesa-7.4.1-gentoo-patches-01.tar.bz2 3727 RMD160 8df6389bc867a1f3892e038e12fcb285d063b6a4 SHA1 5521f884503004f90c0211fa1c6abbe54a3c4243 SHA256 d39052d8a75f45f07af85b9f50852ac3596e90296b8afbe6a71d42bd74caaa79
@@ -18,6 +19,7 @@ EBUILD mesa-7.3-r1.ebuild 7312 RMD160 165484966aba64b9ca9f7342ba9d1d464ae03622 S
EBUILD mesa-7.3.ebuild 7193 RMD160 7e11d44f4b3d27968981280cecd68d0dc4b25e5b SHA1 9bfc23142e18e6e135e3d363560645bde881525c SHA256 fc302b1d645de522830ba11871d19c670541da3d0e1209211f1c6ac6860a1eab
EBUILD mesa-7.4.1-r1.ebuild 8014 RMD160 1068c18eab006bccdfa291538074b29f3a37554a SHA1 31fdb6c785ca833654af8ee16c41250fc1632d96 SHA256 a93be506cd33c18a5c9a14cdb3491aedd9ed09da1e2c2beb4471d7d04c00b037
EBUILD mesa-7.4.1-r2.ebuild 8028 RMD160 3cb0a7354ff71125dcca07872a6009baea2411e8 SHA1 f3897b0e20857951889fbb07f902fdcfd79da03c SHA256 3ad796ee9f4d40b0564a0fb3ae9f33918f6e27a952f2383207a0d163556bde43
+EBUILD mesa-7.4.2.ebuild 7983 RMD160 8550f37c9f646030e5c7f3e6837f7a63a42c29a1 SHA1 1f89849673f400e9d06bb1db5e1570183724117d SHA256 6e3bf82566233a23763f80b3eb40fceff779b338bc9d154a45c548e43993dad2
EBUILD mesa-7.4.ebuild 7687 RMD160 b87172541b48207a4e3f1d84b9ca62359c9d972d SHA1 2d226feb694586d6d46006bbc914a455f6f13bf4 SHA256 6e5111028f43207ba0a17ac70f80f66c18b815c9cf9f6de0d0ced93d883a8e40
EBUILD mesa-7.4_rc1.ebuild 7586 RMD160 8b053af8f7b64440db7e5807117a9aabf48c41aa SHA1 ba783f037ec7c37ef20841149df9cc8b8c276e67 SHA256 a792703c8c70e4658e9059c8df54b85d071552f1427f5f049b6ec7c5f8dff931
EBUILD mesa-7.4_rc2.ebuild 7507 RMD160 6b694b5c333488523135eb86210429a809f4207e SHA1 76f97392d69d58d56ecf34f0afdfe618b81ece28 SHA256 f8bbb3437c21819d86caede141e98f3ecb7465499a3519dfa11512fc8376c4b2
diff --git a/media-libs/mesa/mesa-7.4.2.ebuild b/media-libs/mesa/mesa-7.4.2.ebuild
new file mode 100644
index 000000000..2cff13b8b
--- /dev/null
+++ b/media-libs/mesa/mesa-7.4.2.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.4.2.ebuild,v 1.1 2009/05/16 08:43:30 remi Exp $
+
+EAPI="2"
+MULTILIB_IN_SOURCE_BUILD="yes"
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+ GIT_ECLASS="git"
+ EXPERIMENTAL="true"
+ IUSE_VIDEO_CARDS_UNSTABLE="video_cards_nouveau"
+ IUSE_UNSTABLE="gallium"
+ # User can also specify branch by simply adding MESA_LIVE_BRANCH="blesmrt"
+ # to the make.conf, where blesmrt is desired branch.
+ [[ -z ${MESA_LIVE_BRANCH} ]] || EGIT_BRANCH="${MESA_LIVE_BRANCH}"
+fi
+
+inherit autotools multilib flag-o-matic ${GIT_ECLASS} portability multilib-native
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_/-}"
+MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
+if [[ $PV = *_rc* ]]; then
+ SRC_URI="http://www.mesa3d.org/beta/${MY_SRC_P}.tar.gz
+ ${SRC_PATCHES}"
+elif [[ $PV = 9999* ]]; then
+ SRC_URI="${SRC_PATCHES}"
+else
+ SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2
+ ${SRC_PATCHES}"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_VIDEO_CARDS="${IUSE_VIDEO_CARDS_UNSTABLE}
+ video_cards_intel
+ video_cards_mach64
+ video_cards_mga
+ video_cards_none
+ video_cards_r128
+ video_cards_radeon
+ video_cards_radeonhd
+ video_cards_s3virge
+ video_cards_savage
+ video_cards_sis
+ video_cards_sunffb
+ video_cards_tdfx
+ video_cards_trident
+ video_cards_via"
+IUSE="${IUSE_VIDEO_CARDS} ${IUSE_UNSTABLE}
+ debug doc motif nptl pic xcb kernel_FreeBSD"
+
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="!<=x11-base/xorg-x11-6.9
+ !<=x11-proto/xf86driproto-2.0.3
+ app-admin/eselect-opengl
+ dev-libs/expat[lib32?]
+ >=x11-libs/libdrm-2.4.6[lib32?]
+ x11-libs/libICE[lib32?]
+ x11-libs/libX11[xcb?,lib32?]
+ x11-libs/libXdamage[lib32?]
+ x11-libs/libXext[lib32?]
+ x11-libs/libXi[lib32?]
+ x11-libs/libXmu[lib32?]
+ x11-libs/libXxf86vm[lib32?]
+ motif? ( x11-libs/openmotif[lib32?] )
+ doc? ( app-doc/opengl-manpages )
+"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ x11-misc/makedepend
+ >=x11-proto/dri2proto-1.99.3
+ >=x11-proto/glproto-1.4.8
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ x11-proto/xf86driproto
+"
+# glew depend on mesa and it is needed in runtime
+PDEPEND=">=media-libs/glew-1.5.1[lib32?]"
+
+S="${WORKDIR}/${MY_P}"
+
+# Think about: ggi, svga, fbcon, no-X configs
+
+pkg_setup() {
+ if use debug; then
+ append-flags -g
+ fi
+
+ # gcc 4.2 has buggy ivopts
+ if [[ $(gcc-version) = "4.2" ]]; then
+ append-flags -fno-ivopts
+ fi
+
+ # recommended by upstream
+ append-flags -ffast-math
+}
+
+src_unpack() {
+ [[ $PV = 9999* ]] && git_src_unpack || unpack ${A}
+}
+
+src_prepare() {
+ # apply patches
+ if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/patches" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+ # FreeBSD 6.* doesn't have posix_memalign().
+ [[ ${CHOST} == *-freebsd6.* ]] && \
+ sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
+
+ eautoreconf
+}
+
+multilib-native_src_configure_internal() {
+ local myconf
+
+ # Configurable DRI drivers
+ driver_enable swrast
+ driver_enable video_cards_intel i810 i915 i965
+ driver_enable video_cards_mach64 mach64
+ driver_enable video_cards_mga mga
+ driver_enable video_cards_r128 r128
+ # ATI has two implementations as video_cards
+ driver_enable video_cards_radeon radeon r200 r300
+ driver_enable video_cards_radeonhd r300
+ driver_enable video_cards_s3virge s3v
+ driver_enable video_cards_savage savage
+ driver_enable video_cards_sis sis
+ driver_enable video_cards_sunffb ffb
+ driver_enable video_cards_tdfx tdfx
+ driver_enable video_cards_trident trident
+ driver_enable video_cards_via unichrome
+
+ # all live (experimental) stuff is wrapped around with experimental variable
+ # so the users cant get to this parts even with enabled useflags (downgrade
+ # from live to stable for example)
+ if [[ -n ${EXPERIMENTAL} ]]; then
+ # nouveau works only with gallium and intel, radeon, radeonhd can use
+ # gallium as alternative implementation (NOTE: THIS IS EXPERIMENTAL)
+ if use video_cards_nouveau && ! use gallium ; then
+ elog "Nouveau driver is available only via gallium interface."
+ elog "Enable gallium useflag if you want to use nouveau."
+ echo
+ fi
+ # state trackers, for now enable the one i want
+ # think about this bit more...
+ myconf="${myconf} $(use_enable gallium)"
+ if use gallium; then
+ elog "Warning gallium interface is highly experimental so use"
+ elog "it only if you feel really really brave."
+ elog
+ elog "Intel: works only i915."
+ elog "Nouveau: only available implementation, so no other choice"
+ elog "Radeon: not working, disabled."
+ echo
+ myconf="${myconf}
+ --with-state-trackers=glx,dri,egl
+ $(use_enable video_cards_nouveau gallium-nouveau)
+ $(use_enable video_cards_intel gallium-intel)"
+ #$(use_enable video_cards_radeon gallium-radeon)
+ #$(use_enable video_cards_radeonhd gallium-radeon)"
+ fi
+ fi
+
+ # Deactivate assembly code for pic build
+ # Sparc assembly code is not working
+ myconf="${myconf} $(use_enable !pic asm)"
+ myconf="${myconf} $(use_enable !sparc asm)"
+
+ # --with-driver=dri|xlib|osmesa ; might get changed later to something
+ # else than dri
+ econf \
+ --with-driver=dri \
+ --disable-glut \
+ --without-demos \
+ $(use_enable debug) \
+ $(use_enable motif glw) \
+ $(use_enable motif) \
+ $(use_enable nptl glx-tls) \
+ $(use_enable xcb) \
+ --with-dri-drivers=${DRI_DRIVERS} \
+ ${myconf}
+}
+
+multilib-native_src_install_internal() {
+ dodir /usr
+ emake DESTDIR="${D}" install || die "Installation failed"
+
+ # Remove redundant headers
+ # GLUT thing
+ rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed."
+ # Glew headers
+ rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \
+ || die "Removing glew includes failed."
+
+ # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
+ # because user can eselect desired GL provider.
+ ebegin "Moving libGL and friends for dynamic switching"
+ dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
+ local x
+ for x in "${D}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
+ if [ -f ${x} -o -L ${x} ]; then
+ mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
+ || die "Failed to move ${x}"
+ fi
+ done
+ for x in "${D}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+ if [ -f ${x} -o -L ${x} ]; then
+ mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
+ || die "Failed to move ${x}"
+ fi
+ done
+ eend $?
+
+ # Install libtool archives
+ insinto /usr/$(get_libdir)
+ # Should this use the -L/usr/lib instead of -L/usr/$(get_libdir)?
+ # Please confirm and update this comment or the file.
+ doins "${FILESDIR}"/lib/libGLU.la || die "doins libGLU.la failed"
+ sed -i -e "s:/lib:/$(get_libdir):g" \
+ "${D}"/usr/$(get_libdir)/libGLU.la
+
+ sed \
+ -e "s:\${libdir}:$(get_libdir):g" \
+ "${FILESDIR}"/lib/libGL.la \
+ > "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+
+ # On *BSD libcs dlopen() and similar functions are present directly in
+ # libc.so and does not require linking to libdl. portability eclass takes
+ # care of finding the needed library (if needed) witht the dlopen_lib
+ # function.
+ sed -i \
+ -e 's:-ldl:'$(dlopen_lib)':g' \
+ "${D}"/usr/$(get_libdir)/{libGLU.la,opengl/xorg-x11/lib/libGL.la} \
+ || die "sed dlopen failed"
+}
+
+pkg_postinst() {
+ # Switch to the xorg implementation.
+ echo
+ eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+driver_enable() {
+ case $# in
+ # for enabling unconditionally
+ 1)
+ DRI_DRIVERS="${DRI_DRIVERS},$1"
+ ;;
+ *)
+ if use $1; then
+ shift
+ for i in $@; do
+ DRI_DRIVERS="${DRI_DRIVERS},${i}"
+ done
+ fi
+ ;;
+ esac
+}