--- opengl-update-2.2.1 2005-05-30 20:29:12.000000000 +0000 +++ opengl-update-2.2.1-hacked 2005-05-30 20:28:46.000000000 +0000 @@ -7,7 +7,10 @@ # Further modifications based off submissions to bug #54984 # Further modifications by Jeremy Huddleston -. /etc/init.d/functions.sh +#hacked for use with magellan-linux +# + +source /etc/init.d/functions hasq() { local x @@ -31,10 +34,11 @@ } check_version() { - if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then - eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4" - exit 1 - fi + #if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then + # eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4" + # exit 1 + #fi + return 0 } get_current_implem() { @@ -102,7 +106,7 @@ $(echo ${AVAIL_IMPLEMS} | wc -w) available implementation${IMPLEM_PLURAL}: ${AVAIL_IMPLEMS} Examples: - ${0##*/} xorg-x11 + ${0##*/} xorg This will setup things to use libGL.so from X.org. ${0##*/} nvidia @@ -187,7 +191,7 @@ exit 1 fi - ebegin "Switching to ${GL_IMPLEM} OpenGL interface" + echo "Switching to ${GL_IMPLEM} OpenGL interface" rm -f ${ENV_D} &> /dev/null LIBDIRS="lib32 lib lib64" @@ -200,9 +204,9 @@ [[ -d "${PREFIX}/${LIBDIR}/opengl" && ! -h "${PREFIX}/${LIBDIR}" ]] || continue fi - # Fallback on xorg-x11 if we don't have this implementation for this LIBDIR. + # Fallback on xorg if we don't have this implementation for this LIBDIR. if [[ ! -d ${PREFIX}/${LIBDIR}/opengl/"${GL_IMPLEM}" ]]; then - GL_LOCAL="xorg-x11" + GL_LOCAL="xorg" else GL_LOCAL="${GL_IMPLEM}" fi @@ -298,9 +302,9 @@ elif [[ -e ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} ]]; then [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file} ln -s ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} - elif [[ -e ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file} ]]; then + elif [[ -e ${PREFIX}/${LIBDIR}/opengl/xorg/include/${file} ]]; then [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file} - ln -s ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file} + ln -s ${PREFIX}/${LIBDIR}/opengl/xorg/include/${file} fi done popd &> /dev/null @@ -313,9 +317,9 @@ echo "LDPATH=\"${ldpath}\"" > ${ENV_D} echo "OPENGL_PROFILE=\"${GL_IMPLEM}\"" >> ${ENV_D} - env-update + env-rebuild - eend 0 + return 0 } ## START PROGRAM ##