Diff of /branches/R11-unstable/include/xorg.sminc

Parent Directory | Revision Log | Patch

	revision 9880 by niro, Sat Jan 14 01:48:34 2012 UTC	revision 20668 by niro, Mon Feb 3 10:29:49 2014 UTC
#	Line 52  is_xorg_driver()	Line 52  is_xorg_driver()
52	return 1	return 1
53	}	}
54
	# check if old <=Xorg-6.9 is installed; aborts installation
	is_old_xorg_installed()
	{
	local RED="\033[1;6m\033[31m"
	local DEF="\033[0m"
	if [ -e /usr/X11R6 ] && [[ $(readlink /usr/X11R6) != ../usr ]]
	then
	echo
	echo -e ${RED}" !!! Remove all old <=xorg-6.9 installations first."${DEF}
	echo -e ${RED}" !!! You also need to check all packages which are installed to /usr/X11R6"${DEF}
	echo
	# print a pkg list if magequery supports this
	if [[ -n $(/sbin/magequery -h | grep -- -f) ]]
	then
	echo "Please check following packages:"
	/sbin/magequery -f /usr/X11R6 | while read pkg
	do
	echo -e " ${RED}*${DEF} ${pkg}"
	done
	echo
	fi
	die "/usr/X11R6 directory exists ..."
	fi
	}
55	# default vars	# default vars
56	X11_DIR="/usr"	X11_DIR="/usr"
57
#	Line 93  INHERITS="${INHERITS} xorg"	Line 65  INHERITS="${INHERITS} xorg"
65	#XORG_MIRROR="http://ftp.x.org/pub"	#XORG_MIRROR="http://ftp.x.org/pub"
66	XORG_MIRROR="http://xorg.freedesktop.org/archive"	XORG_MIRROR="http://xorg.freedesktop.org/archive"
67
68		if [[ -n ${PCATEGORIE} ]] && [[ -z ${PCAT} ]]
69		then
70		PCAT="${PCATEGORIE}"
71		fi
72
73	# get the right subdir	# get the right subdir
74	case ${PCAT} in	case ${PCAT} in
75	app-doc) URISUBDIR="doc" ;;	app-doc) URISUBDIR="doc" ;;
#	Line 100  case ${PCAT} in	Line 77  case ${PCAT} in
77	x11-apps) URISUBDIR="app" ;;	x11-apps) URISUBDIR="app" ;;
78	x11-base) URISUBDIR="xserver" ;;	x11-base) URISUBDIR="xserver" ;;
79	x11-drivers) URISUBDIR="driver" ;;	x11-drivers) URISUBDIR="driver" ;;
80	x11-libs) URISUBDIR="lib" ;;	x11-libs)
81		case ${PNAME} in
82		glamor-egl) URISUBDIR="driver" ;;
83		*) URISUBDIR="lib" ;;
84		esac
85		;;
86	x11-misc) case ${PNAME} in	x11-misc) case ${PNAME} in
87	xbitmaps|xkbdata) URISUBDIR="data" ;;	xbitmaps|xkbdata) URISUBDIR="data" ;;
88	xkeyboard-config) URISUBDIR="data/xkeyboard-config" ;;	xkeyboard-config) URISUBDIR="data/xkeyboard-config" ;;
#	Line 114  esac	Line 96  esac
96
97	SRC_URI=(	SRC_URI=(
98	${SRC_URI[*]}	${SRC_URI[*]}
	# ${XORG_MIRROR}/individual/app/${SRCFILE}
	# ${XORG_MIRROR}/individual/data/${SRCFILE}
	# ${XORG_MIRROR}/individual/doc/${SRCFILE}
	# ${XORG_MIRROR}/individual/driver/${SRCFILE}
	# ${XORG_MIRROR}/individual/font/${SRCFILE}
	# ${XORG_MIRROR}/individual/lib/${SRCFILE}
	# ${XORG_MIRROR}/individual/proto/${SRCFILE}
	# ${XORG_MIRROR}/individual/testdir/${SRCFILE}
	# ${XORG_MIRROR}/individual/util/${SRCFILE}
	# ${XORG_MIRROR}/individual/xserver/${SRCFILE}
99	${XORG_MIRROR}/individual/${URISUBDIR}/${SRCFILE}	${XORG_MIRROR}/individual/${URISUBDIR}/${SRCFILE}
100	mirror://${PNAME}/${SRCFILE}	mirror://${PNAME}/${SRCFILE}
101	)	)
#	Line 183  fi	Line 155  fi
155
156	xorg_src_prepare()	xorg_src_prepare()
157	{	{
	# check for old xorg installations
	is_old_xorg_installed
158	munpack ${SRCFILE} || die	munpack ${SRCFILE} || die
159	}	}
160
#	Line 233  xorg_src_compile()	Line 202  xorg_src_compile()
202	mmake || die	mmake || die
203	}	}
204
205		xorg_src_check()
206		{
207		cd ${SRCDIR}
208		mmake -k check || die
209		}
210
211	xorg_src_install()	xorg_src_install()
212	{	{
213	cd ${SRCDIR}	cd ${SRCDIR}
#	Line 245  xorg_src_install()	Line 220  xorg_src_install()
220	fi	fi
221	}	}
222
223	xorg_preinstall()	export_inherits xorg src_prepare src_compile src_check src_install
	{
	# check for old xorg installations
	is_old_xorg_installed
	# run this in postinstall to cover --src-install builds
	# ( the is now package-dir at this moment, cause its not already builded :)
	# if [[ -n ${XORG_FONT_PKG} ]]
	# then
	# xorg_discover_font_dirs
	# fi
	}
	export_inherits xorg src_prepare src_compile src_install preinstall

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.9880   changed lines   Added in v.20668