Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/opengl-update-magellan/opengl-update-2.2.1-magellanize2.patch

    Annotation of /trunk/opengl-update-magellan/opengl-update-2.2.1-magellanize2.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 33 - (hide annotations) (download)
    Thu Aug 4 14:05:55 2005 UTC (18 years, 9 months ago) by niro
    File size: 2847 byte(s) 
    removed check_version completely and fixed wrong DST_PREFIX=/usr to /usr/X11R6
    1 niro 33 --- /mnt/samba/MAGELLAN_BUILD/sources/opengl-update-magellan/opengl-update-2.2.1 2005-05-30 20:31:38.000000000 +0000
    2     +++ opengl-update-2.2.1 2005-08-04 15:34:00.000000000 +0000
    3     @@ -7,7 +7,10 @@
    4     # Further modifications based off submissions to bug #54984 <cyfred@gentoo.org>
    5     # Further modifications by Jeremy Huddleston <eradicator@gentoo.org>
    6    
    7     -. /etc/init.d/functions.sh
    8     +#hacked for use with magellan-linux
    9     +# <niro@magellan-linux.de>
    10     +
    11     +source /etc/init.d/functions
    12    
    13     hasq() {
    14     local x
    15     @@ -30,13 +33,6 @@
    16     fi
    17     }
    18    
    19     -check_version() {
    20     - if ! portageq has_version / '>=x11-base/xorg-x11-6.8.0-r4'; then
    21     - eerror "This version requires >=x11-base/xorg-x11-6.8.0-r4"
    22     - exit 1
    23     - fi
    24     -}
    25     -
    26     get_current_implem() {
    27     local implem
    28     if [[ -f ${ENV_D} ]]; then
    29     @@ -102,7 +98,7 @@
    30     $(echo ${AVAIL_IMPLEMS} | wc -w) available implementation${IMPLEM_PLURAL}: ${AVAIL_IMPLEMS}
    31    
    32     Examples:
    33     - ${0##*/} xorg-x11
    34     + ${0##*/} xorg
    35     This will setup things to use libGL.so from X.org.
    36    
    37     ${0##*/} nvidia
    38     @@ -176,7 +172,6 @@
    39     local GL_IMPLEM=${1}
    40     local GL_LOCAL
    41    
    42     - check_version
    43     check_user
    44    
    45     # Set a sane umask... bug #83115
    46     @@ -187,7 +182,7 @@
    47     exit 1
    48     fi
    49    
    50     - ebegin "Switching to ${GL_IMPLEM} OpenGL interface"
    51     + echo "Switching to ${GL_IMPLEM} OpenGL interface"
    52     rm -f ${ENV_D} &> /dev/null
    53    
    54     LIBDIRS="lib32 lib lib64"
    55     @@ -200,9 +195,9 @@
    56     [[ -d "${PREFIX}/${LIBDIR}/opengl" && ! -h "${PREFIX}/${LIBDIR}" ]] || continue
    57     fi
    58    
    59     - # Fallback on xorg-x11 if we don't have this implementation for this LIBDIR.
    60     + # Fallback on xorg if we don't have this implementation for this LIBDIR.
    61     if [[ ! -d ${PREFIX}/${LIBDIR}/opengl/"${GL_IMPLEM}" ]]; then
    62     - GL_LOCAL="xorg-x11"
    63     + GL_LOCAL="xorg"
    64     else
    65     GL_LOCAL="${GL_IMPLEM}"
    66     fi
    67     @@ -298,9 +293,9 @@
    68     elif [[ -e ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file} ]]; then
    69     [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
    70     ln -s ${PREFIX}/${LIBDIR}/opengl/${GL_IMPLEM}/include/${file}
    71     - elif [[ -e ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file} ]]; then
    72     + elif [[ -e ${PREFIX}/${LIBDIR}/opengl/xorg/include/${file} ]]; then
    73     [[ -f "${file}" || ( -L "${file}" && ! -e "${file}" ) ]] && rm -f ${file}
    74     - ln -s ${PREFIX}/${LIBDIR}/opengl/xorg-x11/include/${file}
    75     + ln -s ${PREFIX}/${LIBDIR}/opengl/xorg/include/${file}
    76     fi
    77     done
    78     popd &> /dev/null
    79     @@ -313,9 +308,9 @@
    80     echo "LDPATH=\"${ldpath}\"" > ${ENV_D}
    81     echo "OPENGL_PROFILE=\"${GL_IMPLEM}\"" >> ${ENV_D}
    82    
    83     - env-update
    84     + env-rebuild
    85    
    86     - eend 0
    87     + return 0
    88     }
    89    
    90     ## START PROGRAM ##
    91     @@ -324,7 +319,7 @@
    92     NEW_GL_IMPLEM=""
    93     ACTION=""
    94     PREFIX="/usr"
    95     -DST_PREFIX="/usr"
    96     +DST_PREFIX="/usr/X11R6"
    97     AVAIL_IMPLEMS=$(get_implementations)
    98     CURRENT_GL_IMPLEM=$(get_current_implem)
    99     USE_PROFILE_HEADERS="no"