head	1.18;
access;
symbols
	libdrm-1_0_4:1.12
	snapshots-20031203-import:1.1.1.1
	snapshots:1.1.1;
locks; strict;
comment	@# @;


1.18
date	2006.03.16.05.00.07;	author fxkuehl;	state Exp;
branches;
next	1.17;

1.17
date	2006.03.04.22.32.52;	author fxkuehl;	state Exp;
branches;
next	1.16;

1.16
date	2006.02.27.00.15.27;	author fxkuehl;	state Exp;
branches;
next	1.15;

1.15
date	2005.11.04.05.01.40;	author fxkuehl;	state Exp;
branches;
next	1.14;
commitid	405b436ae9d84567;

1.14
date	2005.11.02.16.21.14;	author fxkuehl;	state Exp;
branches;
next	1.13;
commitid	634b4368e6f14567;

1.13
date	2005.10.28.15.25.58;	author fxkuehl;	state Exp;
branches;
next	1.12;
commitid	1a8a436243054567;

1.12
date	2005.01.31.22.38.29;	author fxkuehl;	state Exp;
branches;
next	1.11;

1.11
date	2004.10.03.22.41.05;	author fxkuehl;	state Exp;
branches;
next	1.10;

1.10
date	2004.10.03.11.25.11;	author fxkuehl;	state Exp;
branches;
next	1.9;

1.9
date	2004.04.27.09.36.24;	author fxkuehl;	state Exp;
branches;
next	1.8;

1.8
date	2004.04.19.22.42.20;	author fxkuehl;	state Exp;
branches;
next	1.7;

1.7
date	2004.04.09.16.34.39;	author fxkuehl;	state Exp;
branches;
next	1.6;

1.6
date	2004.03.01.22.40.20;	author fxkuehl;	state Exp;
branches;
next	1.5;

1.5
date	2004.02.23.11.48.09;	author fxkuehl;	state Exp;
branches;
next	1.4;

1.4
date	2004.02.08.13.51.20;	author fxkuehl;	state Exp;
branches;
next	1.3;

1.3
date	2003.12.12.14.31.11;	author fxkuehl;	state Exp;
branches;
next	1.2;

1.2
date	2003.12.11.16.59.54;	author fxkuehl;	state Exp;
branches;
next	1.1;

1.1
date	2003.12.03.15.37.55;	author fxkuehl;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2003.12.03.15.37.55;	author fxkuehl;	state Exp;
branches;
next	;


desc
@@


1.18
log
@Include libexa.so in the common package as it's ABI has changed since
the Xorg 6.9/7 releases.
@
text
@#!/bin/sh

# This is the DRI packaging script. It takes a compiled tree and
# packages up the correct files for the kernel, DRI and libGL modules.
#
#   Frank Worsley   <franco@@nettaxi.com>
#   Alan Hourihane  <alanh@@fairlite.demon.co.uk>
#   Jose Fonseca    <j_r_fonseca@@yahoo.co.uk>
#   Felix Kuehling  <fxkuehl@@gmx.de>
#

# Usage:
#
# dripkg.sh <tag> <srcdir> <bindir> <driver> <extras>
#
# <driver> is one of the following... COMMON, I810, I830, I915, MGA,
#          R128, R200, R300, RADEON, MGA, S3VIRGE, SAVAGE, SIS, TDFX, VIA
# <extras> is a list of extras... XDRIINFO


set -e

# Arguments
DRV_BUILD_TAG=$1
DRV_BLD_DIR=$2
DRV_INST_DIR=$3
DRM_CVS_DIR=$4
DRV=$5
EXTRAS="$6"

# Where to find stuff: Xorg stuff in inst_dir, Mesa in bld_dir
MODULES_DIR=$DRV_INST_DIR/lib/xorg/modules
BIN_DIR=$DRV_INST_DIR/bin
MAN_DIR=$DRV_INST_DIR/man
DRI_DIR=$DRV_BLD_DIR/mesa/Mesa/lib

# Variables for selected driver

# These will later be filled in with the values of whatever driver the user selects.
DRV_NAME=""				# driver name
DRV_DESC=""				# driver description
DRV_DDX=""				# driver xfree86 modules
DRV_DRI=""
DRV_DRM=""				# driver kernel modules
DRV_COMMAND=""				# driver specific commands

# if there is a space between some of these leave it set (needed by create_tar) !
DRV_VERSION=" "				# driver version
DRV_PKG_DESC=""				# driver package description
DRV_PKG_NAME=""				# driver package file name
DRV_BUILD_DESC=" "			# special build description

# TDFX Driver Variables
TDFX_NAME="tdfx"
TDFX_DESC="3Dfx Banshee & Voodoo 3/4/5 Driver"
TDFX_DDX="tdfx"
TDFX_DRI="tdfx"
TDFX_DRM="tdfx"
TDFX_COMMAND=""

# ATI Rage128 Driver Variables
R128_NAME="rage128"
R128_DESC="ATI Rage 128 (Pro) Driver"
R128_DDX="ati r128"
R128_DRI="r128"
R128_DRM="r128"
R128_COMMAND=""

# ATI Radeon Driver Variables
RADEON_NAME="radeon"
RADEON_DESC="ATI Radeon Driver"
RADEON_DDX="ati radeon"
RADEON_DRI="radeon"
RADEON_DRM="radeon"
RADEON_COMMAND=""

# ATI Radeon Driver Variables
R200_NAME="r200"
R200_DESC="ATI Radeon 8500 Driver"
R200_DDX="ati radeon"
R200_DRI="r200"
R200_DRM="radeon"
R200_COMMAND=""

# ATI Radeon Driver Variables
R300_NAME="r300"
R300_DESC="ATI Radeon 9?00/9?50/X?00/X?50 Driver"
R300_DDX="ati radeon"
R300_DRI="r300"
R300_DRM="radeon"
R300_COMMAND=""

# MGA Driver Variables
MGA_NAME="mga"
MGA_DESC="Matrox G200/400/450 Driver"
MGA_DDX="mga"
MGA_DRI="mga"
MGA_DRM="mga"
MGA_COMMAND=""

# I810 Driver Variables
I810_NAME="i810"
I810_DESC="Intel i810/i815 Driver"
I810_DDX="i810"
I810_DRI="i810"
I810_DRM="i810"
I810_COMMAND=""

# I830 Driver Variables
I830_NAME="i830"
I830_DESC="Intel i830/i845 Driver"
I830_DDX="i810"
I830_DRI="i830"
I830_DRM="i830"
I830_COMMAND=""

# I915 Driver Variables
I915_NAME="i915"
I915_DESC="Intel i915 Driver"
I915_DDX="i810"
I915_DRI="i915"
I915_DRM="i915"
I915_COMMAND=""

# SIS Driver Variables
SIS_NAME="sis"
SIS_DESC="Silicon Integrated Systems"
SIS_DDX="sis"
SIS_DRI="sis"
SIS_DRM="sis"
SIS_COMMAND=""

# MACH64 Driver Variables
MACH64_NAME="mach64"
MACH64_DESC="ATI Mach64 Driver"
MACH64_DDX="ati atimisc"
MACH64_DRI="mach64"
MACH64_DRM="mach64"
MACH64_COMMAND=""

# S3VIRGE Driver Variables
S3VIRGE_NAME="s3virge"
S3VIRGE_DESC="S3 Virge Driver"
S3VIRGE_DDX="s3virge"
S3VIRGE_DRI="s3v"
S3VIRGE_DRM="s3v"
S3VIRGE_COMMAND=""

# SAVAGE Driver Variables
SAVAGE_NAME="savage"
SAVAGE_DESC="S3 Savage3D/MX/IX,Savage4,Twister,ProSavage,SuperSavage Driver"
SAVAGE_DDX="savage"
SAVAGE_DRI="savage"
SAVAGE_DRM="savage"
SAVAGE_COMMAND=""

# VIA Driver Variables
VIA_NAME="via"
VIA_DESC="VIA Unichrome integrated graphics Driver"
VIA_DDX="via"
VIA_DRI="unichrome"
VIA_DRM="via"
VIA_COMMAND=""

# COMMON Meta-Driver Variables
COMMON_NAME="common"
COMMON_DESC="Libraries and modules common to all DRI drivers"
COMMON_DDX=""
COMMON_DRI=""
COMMON_DRM=""
COMMON_COMMAND=""


# Utility functions
VERBOSE=1
alias vecho='[ "$VERBOSE" ] && echo'

# Main script
eval "DRV_NAME=\"\$${DRV}_NAME\""
eval "DRV_DESC=\"\$${DRV}_DESC\""
eval "DRV_DDX=\"\$${DRV}_DDX\""
eval "DRV_DRI=\"\$${DRV}_DRI\""
eval "DRV_DRM=\"\$${DRV}_DRM\""
eval "DRV_COMMAND=\"\$${DRV}_COMMAND\""

# Get package name
if [ -n "$DRV_BUILD_TAG" ]
then
	DRV_PKG_NAME=$DRV_NAME"-"$DRV_BUILD_TAG
else
	DRV_PKG_NAME=$DRV_NAME
fi
PKG_DIR=dripkg

# Create working directory
rm -rf $PKG_DIR
mkdir -p $PKG_DIR

# Create the package
PKG_DRV_DIR="$PKG_DIR/$DRV_NAME"
PKG_DRM_DIR="$PKG_DIR/drm"
PKG_GL_DIR="$PKG_DIR/GL"
PKG_CORE_DIR="$PKG_DIR/core"

vecho "Creating $DRV_NAME package..."

if [ "$DRV_NAME" != common ]; then
	# Copy driver sources
	vecho "Copying 2D/3D driver modules..."
	mkdir -p $PKG_DRV_DIR
	for DDX in $DRV_DDX
	do
	        cp $MODULES_DIR/drivers/$DDX"_drv.so" $PKG_DRV_DIR
		strip -g $PKG_DRV_DIR/$DDX"_drv.so"
	done
	cp $DRI_DIR/$DRV_DRI"_dri.so" $PKG_DRV_DIR
	#strip -g $PKG_DRV_DIR/$DRV_DRI"_dri.so"

	# Copy DRM sources
	vecho "Copying DRM kernel module sources..."
	mkdir -p $PKG_DRM_DIR/shared
	mkdir -p $PKG_DRM_DIR/shared-core
	mkdir -p $PKG_DRM_DIR/linux
	mkdir -p $PKG_DRM_DIR/linux-core
	case `uname -s` in
		Linux)
			cp -r $DRM_CVS_DIR/shared $PKG_DRM_DIR
			cp -r $DRM_CVS_DIR/shared-core $PKG_DRM_DIR
			cp -r $DRM_CVS_DIR/linux $PKG_DRM_DIR
			cp -r $DRM_CVS_DIR/linux-core $PKG_DRM_DIR
			if [ -r $DRM_CVS_DIR/shared/drm_pciids.txt -a \
			     -r $DRM_CVS_DIR/scripts/create_linux_pci_lists.sh ]
				then
				sh $DRM_CVS_DIR/scripts/create_linux_pci_lists.sh < $DRM_CVS_DIR/shared/drm_pciids.txt
				mv drm_pciids.h $PKG_DRM_DIR/linux
			fi
			if [ -r $DRM_CVS_DIR/shared-core/drm_pciids.txt -a \
			     -r $DRM_CVS_DIR/scripts/create_linux_pci_lists.sh ]
				then
				sh $DRM_CVS_DIR/scripts/create_linux_pci_lists.sh < $DRM_CVS_DIR/shared-core/drm_pciids.txt
				mv drm_pciids.h $PKG_DRM_DIR/linux-core
			fi
			;;
		*BSD)
			cp -r $DRM_CVS_DIR/bsd/* $PKG_DRM_DIR
			;;
		*)
			echo "Unknown system `uname -s`"
			exit 127
			;;
	esac
	rm -rf $PKG_DRM_DIR/shared/CVS
	rm -rf $PKG_DRM_DIR/shared-core/CVS
	rm -rf $PKG_DRM_DIR/linux/CVS
	rm -rf $PKG_DRM_DIR/linux-core/CVS
else
	# Copy GL library
	vecho "Copying GL library..."
	mkdir -p $PKG_GL_DIR
	# Now using libGL from the Mesa build
	cp $DRI_DIR/libGL.so.1.2 $PKG_GL_DIR && strip -g $PKG_GL_DIR/libGL.so.1.2
	# Copy GLX, GLcore library
	vecho "Copying GLX, GLcore, DRI, DRM, shadow libraries..."
	mkdir -p $PKG_CORE_DIR
	cp $MODULES_DIR/extensions/libglx.so $PKG_CORE_DIR && strip -g $PKG_CORE_DIR/libglx.so
	cp $MODULES_DIR/extensions/libGLcore.so $PKG_CORE_DIR && strip -g $PKG_CORE_DIR/libGLcore.so
	cp $MODULES_DIR/extensions/libdri.so $PKG_CORE_DIR && strip -g $PKG_CORE_DIR/libdri.so
	cp $MODULES_DIR/linux/libdrm.so $PKG_CORE_DIR && strip -g $PKG_CORE_DIR/libdrm.so
	cp $MODULES_DIR/libshadow.so $PKG_CORE_DIR && strip -g $PKG_CORE_DIR/libshadow.so
	cp $MODULES_DIR/libexa.so $PKG_CORE_DIR && strip -g $PKG_CORE_DIR/libexa.so
fi

# Copy the LICENSE file
vecho "Copying LICENSE..."
cp LICENSE $PKG_DIR

# Copy extras and write extras.sh
if [ -n "$EXTRAS" ]
then
        vecho -n "Copying extras and writing extras.sh..." 
        mkdir -p $PKG_DIR/extras
        cat > $PKG_DIR/extras/extras.sh <<EOF
#!/bin/sh
cd extras
XF86_DIR=\$1
EOF
	chmod 755 $PKG_DIR/extras/extras.sh
fi
for EXT in $EXTRAS
do
        vecho -n " $EXT"
        case $EXT in
	        XDRIINFO)
		        cp $BIN_DIR/xdriinfo $PKG_DIR/extras
			cp $MAN_DIR/man1/xdriinfo.1x $PKG_DIR/extras
			cat >> $PKG_DIR/extras/extras.sh <<EOF
XF86_BIN_DIR="\$XF86_DIR/bin"
XF86_MAN1_DIR="\$XF86_DIR/man/man1"
mkdir -p \$XF86_BIN_DIR
cp -f xdriinfo \$XF86_BIN_DIR
mkdir -p \$XF86_MAN1_DIR
cp -f xdriinfo.1x \$XF86_MAN1_DIR
EOF
			;;
	        *)
		        echo "Unknown extra $EXT." 1>&2
			;;
	esac
done
if [ -n "$EXTRAS" ]
then
        vecho ""
fi

# Execute Driver Specific Commands
vecho "Running driver specific commands..."
`$DRV_COMMAND`

# Create package ...
vecho "Copying miscellaneous files..."

# include installation script
[ -e "install.sh" ] && cp install.sh $PKG_DIR/install.sh

# Include documentation files
[ -e "README" ] && cp README $PKG_DIR
[ -e "INSTALL" ] && cp INSTALL $PKG_DIR
[ -e "RELNOTES" ] && cp RELNOTES $PKG_DIR


# create package info file
# The install.sh script expects it as follows right now:
#	DRV_NAME
#	DRV_DESC
#	DRV_ARCH
#	Date Packaged
#	DRV_MODULES
#	DRV_VERSION
#	DRV_BUILD_DESC
echo "$DRV_NAME"       >> "$PKG_DIR/pkginfo"
echo "$DRV_DESC"       >> "$PKG_DIR/pkginfo"
echo "$DRV_ARCH"       >> "$PKG_DIR/pkginfo"
date +%Y%m%d           >> "$PKG_DIR/pkginfo"
echo "$DRV_DRM"        >> "$PKG_DIR/pkginfo"
echo "$DRV_VERSION"    >> "$PKG_DIR/pkginfo"
echo "$DRV_BUILD_DESC" >> "$PKG_DIR/pkginfo"


# create tarball
vecho "Creating tarball..."
rm -rf $DRV_PKG_NAME
mv dripkg $DRV_PKG_NAME
tar -cf - $DRV_PKG_NAME | bzip2 > $DRV_PKG_NAME.tar.bz2

# Clean the working directory
rm -rf $DRV_PKG_NAME
@


1.17
log
@Package and install libshadow.so in the common snapshots. Needed by the
latest i810/i915 drivers.

Cleanup inst/ after packaging.
@
text
@d270 1
@


1.16
log
@* Major re-write of the snapshot build system. It now uses the modular
  Xorg tree for the core components and DDX drivers. This requires
  that a modular Xorg is installed somewhere on the build system. The
  installation location can be specified in config.sh.

* There are also some modifications to CVS download and snapshot
  upload to support the new fd.o server names.

* Fixed a problem when generating shared-core/drm_pciids.h. It used
  the old drm_pciids.txt from shared.

* An older previously uncommitted change to build with
  -fno-strice-aliasing to prevent clipping problems in the mach64
  driver.
@
text
@d263 1
a263 1
	vecho "Copying GLX, GLcore, DRI, DRM libraries..."
d269 1
@


1.15
log
@Changes in packager and installer:
- package and install .so instead of .a modules in the common snapshots
- pack snapshots in unique directories
- remove some backwards-compatibility cruft
@
text
@a22 1

d26 10
a35 10
DRM_CVS_DIR=$3
DRV=$4
EXTRAS="$5"

# CVS Variables
DDX_SUBDIR=xorg/programs/Xserver/hw/xfree86/drivers
DRI_SUBDIR=mesa/lib
LIB_SUBDIR=xorg/lib
CORE_SUBDIR=xorg/programs/Xserver
XDRIINFO_SUBDIR=xorg/programs/xdriinfo
a41 1
DRV_DDX_SUBDIR=""			
a42 1
DRV_DRI_SUBDIR=""
a55 1
TDFX_DDX_SUBDIR="tdfx"
a63 1
R128_DDX_SUBDIR="ati"
a71 1
RADEON_DDX_SUBDIR="ati"
a79 1
R200_DDX_SUBDIR="ati"
a87 1
R300_DDX_SUBDIR="ati"
a95 1
MGA_DDX_SUBDIR="mga"
a103 1
I810_DDX_SUBDIR="i810"
a111 1
I830_DDX_SUBDIR="i810"
a119 1
I915_DDX_SUBDIR="i810"
a127 1
SIS_DDX_SUBDIR="sis"
a135 1
MACH64_DDX_SUBDIR="ati"
a143 1
S3VIRGE_DDX_SUBDIR="s3virge"
a151 1
SAVAGE_DDX_SUBDIR="savage"
a159 1
VIA_DDX_SUBDIR="via"
a167 1
COMMON_DDX_SUBDIR=""
a180 2
eval "DRV_DIR=\"\$${DRV}_DIR\""
eval "DRV_DDX_SUBDIR=\"\$${DRV}_DDX_SUBDIR\""
a185 6
DRV_DDX_DIR=$DRV_BLD_DIR/$DDX_SUBDIR/$DRV_DDX_SUBDIR
DRV_DRI_DIR=$DRV_BLD_DIR/$DRI_SUBDIR
DRV_LIB_DIR=$DRV_BLD_DIR/$LIB_SUBDIR
DRV_CORE_DIR=$DRV_BLD_DIR/$CORE_SUBDIR
XDRIINFO_DIR=$DRV_BLD_DIR/$XDRIINFO_SUBDIR

d193 1
a193 1
PKG_DIR=$DRV_PKG_NAME
d213 1
a213 1
	        cp $DRV_DDX_DIR/$DDX"_drv.so" $PKG_DRV_DIR
d216 1
a216 1
	cp $DRV_DRI_DIR/$DRV_DRI"_dri.so" $PKG_DRV_DIR
d240 1
a240 1
				sh $DRM_CVS_DIR/scripts/create_linux_pci_lists.sh < $DRM_CVS_DIR/shared/drm_pciids.txt
d261 1
a261 7
	cp $DRV_DRI_DIR/libGL.so.1.2 $PKG_GL_DIR && strip -g $PKG_GL_DIR/libGL.so.1.2
	if [ -r $DRV_LIB_DIR/GLU/libGLU.so.1.3 ]; then
		# libGLU.so* was built by DRI CVS a long time ago. s3virge still
		# includes it. Don't know if it's really needed.
		cp $DRV_LIB_DIR/GLU/libGLU.so.1.3 $PKG_GL_DIR && strip -g $PKG_GL_DIR/libGLU.so.1.3
	fi

d265 4
a268 6
	cp $DRV_CORE_DIR/GL/libglx.so $PKG_CORE_DIR && strip -g $PKG_CORE_DIR/libglx.a
	cp $DRV_CORE_DIR/GL/mesa/GLcore/libGLcore.so $PKG_CORE_DIR && strip -g $PKG_CORE_DIR/libGLcore.a
	cp $DRV_CORE_DIR/GL/dri/libdri.so $PKG_CORE_DIR
	strip -g $PKG_CORE_DIR/libdri.so
	cp $DRV_CORE_DIR/hw/xfree86/os-support/linux/drm/libdrm.so $PKG_CORE_DIR
	strip -g $PKG_CORE_DIR/libdrm.so
d273 1
a273 1
cp $DRV_CORE_DIR/hw/xfree86/doc/LICENSE $PKG_DIR
d292 2
a293 2
		        cp $XDRIINFO_DIR/xdriinfo $PKG_DIR/extras
			cp $XDRIINFO_DIR/xdriinfo._man $PKG_DIR/extras/xdriinfo.1x
d349 3
a351 3
PKG_NAME="$DRV_PKG_NAME.tar"
tar -cf $PKG_NAME $PKG_DIR
bzip2 -f $PKG_NAME
d354 1
a354 1
rm -r $PKG_DIR
@


1.14
log
@- build and install DDX drivers for the DLLoader now that a very recent
  Xorg 6.9 server is required due to ABI issues
- fixes for linking libdrm statically (--whole-archive)
@
text
@d17 1
a17 1
#          R128, R200, RADEON, MGA, S3VIRGE, SAVAGE, SIS, TDFX, VIA
a37 6
# Package Variables
PKG_DIR="dripkg"
#PKG_FULL=${FULL:-0}
PKG_FULL=1


d219 1
d239 2
a240 7
		if [ -r $DRV_DDX_DIR/$DDX"_drv.so" ]; then
			cp $DRV_DDX_DIR/$DDX"_drv.so" $PKG_DRV_DIR
			strip -g $PKG_DRV_DIR/$DDX"_drv.so"
		else
			cp $DRV_DDX_DIR/$DDX"_drv.o" $PKG_DRV_DIR
			strip -g $PKG_DRV_DIR/$DDX"_drv.o"
		fi
d286 7
a292 10
	#if [ $PKG_FULL -ne 0 ]
	#then
	        # Now using libGL from the Mesa build
		cp $DRV_DRI_DIR/libGL.so.1.2 $PKG_GL_DIR && strip -g $PKG_GL_DIR/libGL.so.1.2
		if [ -r $DRV_LIB_DIR/GLU/libGLU.so.1.3 ]; then
		    # libGLU.so* was built by DRI CVS a long time ago. s3virge still
		    # includes it. Don't know if it's really needed.
		    cp $DRV_LIB_DIR/GLU/libGLU.so.1.3 $PKG_GL_DIR && strip -g $PKG_GL_DIR/libGLU.so.1.3
		fi
	#fi
d297 6
a302 11
	if [ $PKG_FULL -ne 0 ]
	then
		cp $DRV_CORE_DIR/GL/libglx.a $PKG_CORE_DIR && strip -g $PKG_CORE_DIR/libglx.a
		cp $DRV_CORE_DIR/GL/mesa/GLcore/libGLcore.a $PKG_CORE_DIR && strip -g $PKG_CORE_DIR/libGLcore.a
	fi
		# HACK: fix binary incompatabilities... 2002/06/24
		cp $DRV_CORE_DIR/GL/dri/libdri.a $PKG_CORE_DIR
		strip -g $PKG_CORE_DIR/libdri.a
		# HACK: fix binary incompatabilities...
		cp $DRV_CORE_DIR/hw/xfree86/os-support/linux/drm/libdrm.a $PKG_CORE_DIR
		strip -g $PKG_CORE_DIR/libdrm.a
@


1.13
log
@Update snapshot build. Include R300 driver.
@
text
@d244 7
a250 2
		cp $DRV_DDX_DIR/$DDX"_drv.o" $PKG_DRV_DIR
		strip -g $PKG_DRV_DIR/$DDX"_drv.o"
@


1.12
log
@Updates for building snapshots on marx.
Remote upload and download.
Include linux-core instead of linux-2.6.
Build with ELF loader for compatibility with released Xorg versions.
@
text
@d98 9
d293 2
a294 1
		cp $DRV_LIB_DIR/GL/GL/libGL.so.1.2 $PKG_GL_DIR && strip -g $PKG_GL_DIR/libGL.so.1.2
@


1.11
log
@Major reorganization of snapshot builds. Now uses Xorg CVS instead of a
XFree86 tarball + DRI CVS. Copes better with multiple CVS repositories
providing different parts of the source. Moves all branch-specific
knowledge from the scripts to config.sh. Adds a new abstraction called
"configuration" that defines which branch from each repository is
combined into a set of snapshots. Drivers to build and package and
compiler options are selected per-configuration in config.sh. Right now
there is only one configuration "HEAD".
@
text
@d244 1
d246 1
a246 1
	mkdir -p $PKG_DRM_DIR/linux-2.6
d250 1
d252 1
a252 1
			cp -r $DRM_CVS_DIR/linux-2.6 $PKG_DRM_DIR
d257 7
a263 2
				cp drm_pciids.h $PKG_DRM_DIR/linux
				mv drm_pciids.h $PKG_DRM_DIR/linux-2.6
d275 1
d277 1
a277 1
	rm -rf $PKG_DRM_DIR/linux-2.6/CVS
@


1.10
log
@Package shared, linux and linux-2.6 DRM components. install.sh picks the
right directory based on uname -r.
@
text
@d1 1
a1 1
#!/bin/bash
d9 1
d16 2
a17 1
# <driver> is one of the following... R128, RADEON, MGA, TDFX, I810
d26 2
a27 2
DRM_CVS_DIR=$2
DRV_BLD_DIR=$3
d32 5
a36 13
DDX_SUBDIR=xc/programs/Xserver/hw/xfree86/drivers
DRM_SUBDIR=drm/kernel
# old or new mesa directory layout?
if [ -d $DRV_BLD_DIR/xc/lib/GL/mesa/drivers/dri ]; then
    # new
    DRI_SUBDIR=xc/lib/GL/mesa/drivers/dri
else
    # old
    DRI_SUBDIR=xc/lib/GL/mesa/src/drv
fi
LIB_SUBDIR=xc/lib
CORE_SUBDIR=xc/programs/Xserver
XDRIINFO_SUBDIR=xc/programs/xdriinfo
d66 1
a66 2
TDFX_DDX="tdfx" 
TDFX_DRI_SUBDIR="tdfx"
d75 1
a75 2
R128_DDX="ati r128" 
R128_DRI_SUBDIR="r128"
d84 1
a84 2
RADEON_DDX="ati radeon" 
RADEON_DRI_SUBDIR="radeon"
d93 1
a93 2
R200_DDX="ati radeon" 
R200_DRI_SUBDIR="r200"
d102 1
a102 2
MGA_DDX="mga" 
MGA_DRI_SUBDIR="mga"
d111 1
a111 2
I810_DDX="i810" 
I810_DRI_SUBDIR="i810"
d120 1
a120 2
I830_DDX="i810" 
I830_DRI_SUBDIR="i830"
d125 9
a138 1
SIS_DRI_SUBDIR="sis"
d147 1
a147 2
MACH64_DDX="ati atimisc" 
MACH64_DRI_SUBDIR="mach64"
d156 1
a156 2
S3VIRGE_DDX="s3virge" 
S3VIRGE_DRI_SUBDIR="s3v"
a165 1
SAVAGE_DRI_SUBDIR="savage"
d170 9
a183 1
COMMON_DRI_SUBDIR=""
d191 1
a191 5
function vecho()
{
	[ "$VERBOSE" ] && echo "$@@"
}

a198 1
eval "DRV_DRI_SUBDIR=\"\$${DRV}_DRI_SUBDIR\""
d204 1
a204 1
DRV_DRI_DIR=$DRV_BLD_DIR/$DRI_SUBDIR/$DRV_DRI_SUBDIR
@


1.9
log
@Generate drm_pciids.h for inclusion in the snapshots.
@
text
@d248 3
a250 1
	mkdir -p $PKG_DRM_DIR
d253 3
a255 1
			cp -r $DRM_CVS_DIR/linux/* $PKG_DRM_DIR
d260 2
a261 1
				mv drm_pciids.h $PKG_DRM_DIR
d272 3
a274 6
	# HACK: invert order to cope with redundant files in the linux drm dir...
	if [ -e $DRM_CVS_DIR/shared ]
	then
		cp -r $DRM_CVS_DIR/shared/* $PKG_DRM_DIR
	fi
	rm -rf $PKG_DRM_DIR/CVS
@


1.8
log
@Split snapshots into a driver-specific and a common part.
Check whether to use Makefile.linux or Makefile to build the drm.
The new install.sh is untested. Please report any problems.
@
text
@d252 6
@


1.7
log
@Use the new standalone drm tree.
@
text
@d46 2
a47 1
PKG_FULL=${FULL:-0}
d178 10
d234 54
a287 43
# Copy driver sources
vecho "Copying 2D/3D driver modules..."
mkdir -p $PKG_DRV_DIR
for DDX in $DRV_DDX
do
	cp $DRV_DDX_DIR/$DDX"_drv.o" $PKG_DRV_DIR
	strip -g $PKG_DRV_DIR/$DDX"_drv.o"
done
cp $DRV_DRI_DIR/$DRV_DRI"_dri.so" $PKG_DRV_DIR
#strip -g $PKG_DRV_DIR/$DRV_DRI"_dri.so"

# Copy DRM sources
vecho "Copying DRM kernel module sources..."
mkdir -p $PKG_DRM_DIR
case `uname -s` in
	Linux)
		cp -r $DRM_CVS_DIR/linux/* $PKG_DRM_DIR
		;;
	*BSD)
		cp -r $DRM_CVS_DIR/bsd/* $PKG_DRM_DIR
		;;
	*)
		echo "Unknown system `uname -s`"
		exit 127
		;;
esac
# HACK: invert order to cope with redundant files in the linux drm dir...
if [ -e $DRM_CVS_DIR/shared ]
then
	cp -r $DRM_CVS_DIR/shared/* $PKG_DRM_DIR
fi
rm -rf $PKG_DRM_DIR/CVS

# Copy GL library
vecho "Copying GL library..."
mkdir -p $PKG_GL_DIR
#if [ $PKG_FULL -ne 0 ]
#then
	cp $DRV_LIB_DIR/GL/GL/libGL.so.1.2 $PKG_GL_DIR && strip -g $PKG_GL_DIR/libGL.so.1.2
	if [ -r $DRV_LIB_DIR/GLU/libGLU.so.1.3 ]; then
	    # libGLU.so* was built by DRI CVS a long time ago. s3virge still
	    # includes it. Don't know if it's really needed.
	    cp $DRV_LIB_DIR/GLU/libGLU.so.1.3 $PKG_GL_DIR && strip -g $PKG_GL_DIR/libGLU.so.1.3
d289 6
a294 9
#fi

# Copy GLX, GLcore library
vecho "Copying GLX, GLcore, DRI, DRM libraries..."
mkdir -p $PKG_CORE_DIR
if [ $PKG_FULL -ne 0 ]
then
	cp $DRV_CORE_DIR/GL/libglx.a $PKG_CORE_DIR && strip -g $PKG_CORE_DIR/libglx.a
	cp $DRV_CORE_DIR/GL/mesa/src/libGLcore.a $PKG_CORE_DIR || true
a295 6
	# HACK: fix binary incompatabilities... 2002/06/24
	cp $DRV_CORE_DIR/GL/dri/libdri.a $PKG_CORE_DIR
	strip -g $PKG_CORE_DIR/libdri.a
	# HACK: fix binary incompatabilities...
	cp $DRV_CORE_DIR/hw/xfree86/os-support/linux/drm/libdrm.a $PKG_CORE_DIR
	strip -g $PKG_CORE_DIR/libdrm.a
@


1.6
log
@Include LICENSE in binary snapshots.
@
text
@d24 1
a24 1
DRV_CVS_DIR=$2
a30 1
OSS_SUBDIR=xc/programs/Xserver/hw/xfree86/os-support
a197 1
DRV_OSS_DIR=$DRV_CVS_DIR/$OSS_SUBDIR
d239 1
a239 1
		cp -r $DRV_OSS_DIR/linux/$DRM_SUBDIR/* $PKG_DRM_DIR
d242 1
a242 1
		cp -r $DRV_OSS_DIR/bsd/$DRM_SUBDIR/* $PKG_DRM_DIR
d250 1
a250 1
if [ -e $DRV_OSS_DIR/shared/$DRM_SUBDIR ]
d252 1
a252 1
	cp -r $DRV_OSS_DIR/shared/$DRM_SUBDIR/* $PKG_DRM_DIR
@


1.5
log
@Build and package savage snapshots from the trunk.
@
text
@d286 4
@


1.4
log
@Committing Eric Anholt's latest changes to build snapshots in /home/projects/dri/snapshots and to use the new Mesa repository on freedesktop.org.
@
text
@d168 10
@


1.3
log
@Include SiS in trunk snapshots.
@
text
@d352 1
a352 1
bzip2 $PKG_NAME
@


1.2
log
@Build and package DRI HEAD after newmesa merge.
@
text
@d138 10
@


1.1
log
@Initial revision
@
text
@d33 8
a40 1
DRI_SUBDIR=xc/lib/GL/mesa/src/drv
@


1.1.1.1
log
@Imported snapshot build scripts.
@
text
@@