[patch] 01-opengl-move.patch

01-opengl-move.patch (text/plain), 4.89 KB, created by Michał Górny on 2014-12-07 11:38:47 UTC

diff --git a/media-libs/mesa/mesa-10.3.4.ebuild b/media-libs/mesa/mesa-10.3.4-r1.ebuild
similarity index 88%
copy from media-libs/mesa/mesa-10.3.4.ebuild
copy to media-libs/mesa/mesa-10.3.4-r1.ebuild
index 0e73198..a51d4ca 100644
--- a/media-libs/mesa/mesa-10.3.4.ebuild
+++ b/media-libs/mesa/mesa-10.3.4-r1.ebuild
@@ -333,32 +333,6 @@ multilib_src_configure() {
 multilib_src_install() {
 	emake install DESTDIR="${D}"
 
-	# 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"
-		local x
-		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
-		dodir ${gl_dir}/{lib,extensions,include/GL}
-		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
-			if [ -d ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-
 	if use classic || use gallium; then
 			ebegin "Moving DRI/Gallium drivers for dynamic switching"
 			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
@@ -390,20 +364,6 @@ multilib_src_install() {
 			popd
 		eend $?
 	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
 
 	if use openmax; then
 		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
@@ -437,27 +397,11 @@ multilib_src_test() {
 }
 
 pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
-	OLD_IMPLEM="$(eselect opengl show)"
-	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
-		eselect opengl set ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-	fi
-
 	# Select classic/gallium drivers
 	if use classic || use gallium; then
 		eselect mesa set --auto
 	fi
 
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
 	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
 	if use openmax; then
 		ebegin "Registering OpenMAX drivers"
diff --git a/x11-base/xorg-server/xorg-server-1.16.2.ebuild b/x11-base/xorg-server/xorg-server-1.16.2-r1.ebuild
similarity index 86%
copy from x11-base/xorg-server/xorg-server-1.16.2.ebuild
copy to x11-base/xorg-server/xorg-server-1.16.2-r1.ebuild
index c28555a..2397cbd 100644
--- a/x11-base/xorg-server/xorg-server-1.16.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.16.2-r1.ebuild
@@ -187,25 +187,12 @@ src_configure() {
 		--with-sha1=libcrypto
 	)
 
-	# Xorg-server requires includes from OS mesa which are not visible for
-	# users of binary drivers.
-	mkdir -p "${T}/mesa-symlinks/GL"
-	for i in gl glx glxmd glxproto glxtokens; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	for i in glext glxext; do
-		ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
-	done
-	append-cppflags "-I${T}/mesa-symlinks"
-
 	xorg-2_src_configure
 }
 
 src_install() {
 	xorg-2_src_install
 
-	dynamic_libgl_install
-
 	server_based_install
 
 	if ! use minimal &&	use xorg; then
@@ -223,9 +210,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
-	eselect opengl set xorg-x11 --use-old
-
 	if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
 		elog "You should consider reading upgrade guide for this release:"
 		elog "  http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
@@ -248,19 +232,6 @@ pkg_postrm() {
 	fi
 }
 
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving GL files for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
-		local x=""
-		for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
-			fi
-		done
-	eend 0
-}
-
 server_based_install() {
 	if ! use xorg; then
 		rm "${ED}"/usr/share/man/man1/Xserver.1x \