New commits:
commit 39c66220a18933fc63d92528cebb0951db530eef
Merge: e2b74ac73fbeb7cf4175c4ee4fac16aac0fe5b8b
393fada755e88537ec56f244ec7f98677e518690
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
commit e2b74ac73fbeb7cf4175c4ee4fac16aac0fe5b8b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Removed BUILD_API=2 from display as it is grimoire-wide
commit a37edbd0512cafab3c4b880d913eb7500b6eb607
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Forgot to add INSTALL to xdirectfb
commit 6c05c29fa053fc38f6a31b4286b1d445db9f0f91
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Converted xdirectfb to build_api 2
commit f2e7dd1b4319ea79bc7abab1e4bcd7b63055fb01
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
SOURCE_HASH=sha512:b2bf906d4348318f38c1ba7a1246dc9047519aa2952d3db49062184e32bd6f03a968ae2bacc6ac579f9369e6686920ce9cfa32f19a3abfa47e4a2a5050f60729
-
WEB_SITE=http://www.stud.uni-hamburg.de/users/lennart/projects/atitvout/
- ENTERED=20040411
- UPDATED=20040411
LICENSE[0]=GPL
KEYWORDS="tv display"
- BUILD_API=1
+
WEB_SITE=http://www.stud.uni-hamburg.de/users/lennart/projects/atitvout/
+ ENTERED=20040411
SHORT="TV Out support for ATI cards"
cat << EOF
This utility program may be used for executing several configuration
commands for the TV Out connector of ATI Rage Mobility P/M graphics boards
under GNU/Linux on x86. It is intended primarily to enable TV Out support
after bootup and for switching the used TV standard from NTSC to PAL.
diff --git a/display/atitvout/HISTORY b/display/atitvout/HISTORY
index 7f123c8..07e4599 100644
--- a/display/atitvout/HISTORY
+++ b/display/atitvout/HISTORY
@@ -1,3 +1,8 @@
+2006-06-29 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=1 and UPDATED
+ * PRE_BUILD: Apply sedit for building (moved from BUILD)
+ * BUILD: Converted to build_api 2
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line
- if echo $CFLAGS| grep -q "mmmx"
- then echo "#define HasMMXSupport YES" >> config/cf/host.def
- fi &&
- if echo $CFLAGS| grep -q "msse"
- then echo "#define HasSSESupport YES" >> config/cf/host.def
- fi &&
- if echo $CFLAGS| grep -q "m3dnow"
- then echo "#define Has3DNowSupport YES" >> config/cf/host.def
- fi &&
-
- cd config/util &&
- make -f Makefile.ini lndir &&
- cp lndir $SOURCE_DIRECTORY.bld/ &&
- cd $SOURCE_DIRECTORY.bld &&
- ./lndir ../xc/ &&
- ### Fix Bug #3486, which stops the build process
- ln -sf $SOURCE_DIRECTORY.bld/lib/font/builtins
$SOURCE_DIRECTORY.bld/lib/font/builtins/unshared &&
- ### Some IMAKE issues from the XDirectFB patches need fixing
- # we are about to symlink some headers
- # normally make World does a make clean too so the symlinks would get
removed
- #unless we do the following to the Imakefile
- sedit "s/\$(RM) -r \$(BUILDINCDIR)//" $SOURCE_DIRECTORY/Imakefile
&&
- # now make some dirs and the symlinks
- mkdir -p $SOURCE_DIRECTORY.bld/exports/include/X11/PM
&&
- mkdir -p $SOURCE_DIRECTORY.bld/exports/include/X11/extensions
&&
- mkdir -p $SOURCE_DIRECTORY.bld/exports/include/X11/fonts
&&
- ln -sf $SOURCE_DIRECTORY/programs/proxymngr/PM*
$SOURCE_DIRECTORY.bld/exports/include/X11/PM/ &&
- ln -sf $SOURCE_DIRECTORY/lib/font/include/fontenc.h
$SOURCE_DIRECTORY.bld/exports/include/X11/fonts/ &&
- ln -sf $SOURCE_DIRECTORY/programs/xlsfonts/dsimple.h
$SOURCE_DIRECTORY.bld/exports/include &&
- sedit "s/hw\/i810//" $SOURCE_DIRECTORY.bld/lib/XvMC/Imakefile
&&
- sedit "s/INCLUDES = \$(KRB5_INCLUDE)/& \-I greeter\//"
$SOURCE_DIRECTORY.bld/programs/xdm/Imakefile &&
-
- make World
-
- ### Some more IMAKE issues from the XDirectFB patches need fixing
- man2html $SOURCE_DIRECTORY.bld/doc/man/Xext/XTransparency._man >
$SOURCE_DIRECTORY.bld/doc/man/Xext/XTransparency.3x.html &&
- ### Start compiling where the prior left off
- make
&&
- prepare_install
&&
-
- ### the following is needed for pkgconfig to find the .pc files
- mkdir -p ${INSTALL_ROOT}/usr/X11R6/lib
&&
- ln -sf ${INSTALL_ROOT}/usr/lib/pkgconfig ${INSTALL_ROOT}/usr/X11R6/lib
&&
- make install
&&
- ### more IMAKE foobars
- mkdir -p ${INSTALL_ROOT}/usr/X11R6/lib/X11/doc/html/
&&
- install -c -m 0444
$SOURCE_DIRECTORY.bld/doc/man/Xext/XTransparency.3x.html
\
- ${INSTALL_ROOT}/usr/X11R6/lib/X11/doc/html/XTransparency.3.html
&&
- cp $SOURCE_DIRECTORY/config/cf/directfb.cf
${INSTALL_ROOT}/usr/X11R6/lib/X11/config/ &&
- cp $SOURCE_DIRECTORY/include/extensions/xf86vm*
${INSTALL_ROOT}/usr/X11R6/include/X11/extensions/ &&
- ### normal
- make install.man
&&
- mkdir -p /usr/X11R6/include/GL
-
-) > $C_FIFO 2>&1 && (
-
- rm -f /usr/X11R6/include/zlib.h
- rm -f /usr/X11R6/lib/libz.a
-
- if [ ! -e /etc/skel/.xsession ]; then
- cp $SCRIPT_DIRECTORY/xsession /etc/skel/.xsession
- fi
-
- if [ ! -e /usr/bin/X11 ]; then
- ln -sf /usr/X11R6/bin /usr/bin/X11
- fi
-
- if [ ! -e /usr/X11 ]; then
- ln -sf X11R6 /usr/X11
- fi
-
- if [ ! -e /usr/include/X11 ]; then
- ln -sf ../X11R6/include/X11 /usr/include/X11
- fi
-
- if [ ! -e /usr/lib/X11 ]; then
- ln -sf ../X11R6/lib/X11 /usr/lib/X11
- fi
-
-)
-
-
+if echo $CFLAGS| grep -q "mmmx"; then
+ echo "#define HasMMXSupport YES" >> config/cf/host.def
+fi &&
+
+if echo $CFLAGS| grep -q "msse"; then
+ echo "#define HasSSESupport YES" >> config/cf/host.def
+fi &&
+
+if echo $CFLAGS| grep -q "m3dnow"; then
+ echo "#define Has3DNowSupport YES" >> config/cf/host.def
+fi &&
+
+
+cd config/util &&
+make -f Makefile.ini lndir &&
+cp lndir $SOURCE_DIRECTORY.bld/ &&
+cd $SOURCE_DIRECTORY.bld &&
+./lndir ../xc/ &&
+### Fix Bug #3486, which stops the build process
+ln -sf $SOURCE_DIRECTORY.bld/lib/font/builtins
$SOURCE_DIRECTORY.bld/lib/font/builtins/unshared &&
+### Some IMAKE issues from the XDirectFB patches need fixing
+# we are about to symlink some headers
+# normally make World does a make clean too so the symlinks would get
removed
+#unless we do the following to the Imakefile
+sedit "s/\$(RM) -r \$(BUILDINCDIR)//" $SOURCE_DIRECTORY/Imakefile &&
+# now make some dirs and the symlinks
+mkdir -p $SOURCE_DIRECTORY.bld/exports/include/X11/PM &&
+mkdir -p $SOURCE_DIRECTORY.bld/exports/include/X11/extensions &&
+mkdir -p $SOURCE_DIRECTORY.bld/exports/include/X11/fonts &&
+ln -sf $SOURCE_DIRECTORY/programs/proxymngr/PM*
$SOURCE_DIRECTORY.bld/exports/include/X11/PM/ &&
+ln -sf $SOURCE_DIRECTORY/lib/font/include/fontenc.h
$SOURCE_DIRECTORY.bld/exports/include/X11/fonts/ &&
+ln -sf $SOURCE_DIRECTORY/programs/xlsfonts/dsimple.h
$SOURCE_DIRECTORY.bld/exports/include &&
+sedit "s/hw\/i810//" $SOURCE_DIRECTORY.bld/lib/XvMC/Imakefile &&
+sedit "s/INCLUDES = \$(KRB5_INCLUDE)/& \-I greeter\//"
$SOURCE_DIRECTORY.bld/programs/xdm/Imakefile &&
+
+make World
+
+### Some more IMAKE issues from the XDirectFB patches need fixing
+man2html $SOURCE_DIRECTORY.bld/doc/man/Xext/XTransparency._man >
$SOURCE_DIRECTORY.bld/doc/man/Xext/XTransparency.3x.html &&
+### Start compiling where the prior left off
+make
diff --git a/display/xdirectfb/DETAILS b/display/xdirectfb/DETAILS
index 9abc5ac..d6bc306 100755
--- a/display/xdirectfb/DETAILS
+++ b/display/xdirectfb/DETAILS
@@ -33,7 +33,6 @@
SOURCE9_HASH=sha512:772e97afd84d49c428ca5cfa13f8b7ad7833e5b72893d0d57292a4fd897b75120d41c92f88d1d88776f9ff1aac646ca78a9fb3c2890c85b3d7c48f3aadbeb0b5
WEB_SITE=http://www.directfb.org/xdirectfb.xml
ENTERED=20030916
- UPDATED=20050822
LICENSE[0]=LGPL
LICENSE[1]=XCL
LICENSE[2]=XCL
@@ -46,7 +45,6 @@
LICENSE[9]=XCL
FUZZ="off"
KEYWORDS="framebuffer display"
- BUILD_API=1
SHORT="a rootless X Server using DirectFB"
cat << EOF
XDirectFB is a rootless X Server using DirectFB windows for X11 toplevel
windows.
diff --git a/display/xdirectfb/FINAL b/display/xdirectfb/FINAL
new file mode 100755
index 0000000..50eb3a0
--- /dev/null
+++ b/display/xdirectfb/FINAL
@@ -0,0 +1,5 @@
+rm_source_dir $SOURCE_DIRECTORY.bld
+if ! grep -q /usr/X11R6/lib /etc/ld.so.conf
+then echo "/usr/X11R6/lib/" >> /etc/ld.so.conf
+ ldconfig
+fi
diff --git a/display/xdirectfb/HISTORY b/display/xdirectfb/HISTORY
index 097b79e..be49194 100755
--- a/display/xdirectfb/HISTORY
+++ b/display/xdirectfb/HISTORY
@@ -1,3 +1,10 @@
+2006-06-29 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=1 and UPDATED
+ * BUILD: Converted to build_api 2
+ * INSTALL: Copied from BUILD
+ Converted to build_api 2
+ * POST_INSTALL,FINAL: POST_INSTALL renamed to FINAL
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line