Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (39c66220a18933fc63d92528cebb0951db530eef)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (39c66220a18933fc63d92528cebb0951db530eef)
  • Date: Thu, 29 Jun 2006 16:41:18 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

display/atitvout/BUILD | 9 --
display/atitvout/DETAILS | 6 -
display/atitvout/HISTORY | 5 +
display/atitvout/PRE_BUILD | 2
display/dfbsee/DETAILS | 1
display/dfbsee/HISTORY | 3
display/directfb-extra/DETAILS | 1
display/directfb-extra/HISTORY | 3
display/directfb/DETAILS | 1
display/directfb/HISTORY | 3
display/fbv/DETAILS | 1
display/fbv/HISTORY | 3
display/fresco/DETAILS | 1
display/fresco/HISTORY | 3
display/libgii/DETAILS | 1
display/libgii/HISTORY | 3
display/qingy-themes/DETAILS | 1
display/qingy-themes/HISTORY | 3
display/qingy/DETAILS | 1
display/qingy/HISTORY | 3
display/svgalib/DETAILS | 1
display/svgalib/HISTORY | 3
display/xdirectfb/BUILD | 150
++++++++++++++---------------------------
display/xdirectfb/DETAILS | 2
display/xdirectfb/FINAL | 5 +
display/xdirectfb/HISTORY | 7 +
display/xdirectfb/INSTALL | 37 ++++++++++
display/xdirectfb/POST_INSTALL | 5 -
display/y/DETAILS | 1
display/y/HISTORY | 3
30 files changed, 142 insertions(+), 126 deletions(-)

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>

Converted atitvout to build_api 2

diff --git a/display/atitvout/BUILD b/display/atitvout/BUILD
index 5b43a59..8f58e6d 100755
--- a/display/atitvout/BUILD
+++ b/display/atitvout/BUILD
@@ -1,8 +1 @@
-(
-
- sedit "s:local/::g" Makefile &&
- make &&
- prepare_install &&
- make install
-
-) > ${C_FIFO} 2>&1
+make
diff --git a/display/atitvout/DETAILS b/display/atitvout/DETAILS
index 8fad6aa..353abd4 100755
--- a/display/atitvout/DETAILS
+++ b/display/atitvout/DETAILS
@@ -4,12 +4,10 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_URL[0]=http://www.stud.uni-hamburg.de/users/lennart/projects/atitvout/${SOURCE}

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

diff --git a/display/atitvout/PRE_BUILD b/display/atitvout/PRE_BUILD
new file mode 100755
index 0000000..608529e
--- /dev/null
+++ b/display/atitvout/PRE_BUILD
@@ -0,0 +1,2 @@
+default_pre_build &&
+sedit "s:local/::g" $SOURCE_DIRECTORY/Makefile
diff --git a/display/dfbsee/DETAILS b/display/dfbsee/DETAILS
index 34c1bfb..205d697 100755
--- a/display/dfbsee/DETAILS
+++ b/display/dfbsee/DETAILS
@@ -9,7 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$PACKA
ENTERED=20041101
UPDATED=20041101
LICENSE[0]=GPL
- BUILD_API=2
KEYWORDS="display"
SHORT="DFB graphics/video viewer"
cat << EOF
diff --git a/display/dfbsee/HISTORY b/display/dfbsee/HISTORY
index 0c8a1ac..8a21365 100644
--- a/display/dfbsee/HISTORY
+++ b/display/dfbsee/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/display/directfb-extra/DETAILS b/display/directfb-extra/DETAILS
index 4dc26b9..cb1fc2c 100755
--- a/display/directfb-extra/DETAILS
+++ b/display/directfb-extra/DETAILS
@@ -6,7 +6,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Direct
#
SOURCE_HASH=sha512:977160d257c972b8e82ddc9f7aa1a3b382662c629aa05d8d2b56a5ec860bafa76410b430154b9592fbc7aac0ab5656dd5867979d05206ec9e2b0c74f313b24fc
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=LGPL
- BUILD_API=2
WEB_SITE=http://www.directfb.org/
ENTERED=20030916
UPDATED=20030916
diff --git a/display/directfb-extra/HISTORY b/display/directfb-extra/HISTORY
index 818d500..59650d9 100644
--- a/display/directfb-extra/HISTORY
+++ b/display/directfb-extra/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/display/directfb/DETAILS b/display/directfb/DETAILS
index 9735a95..85ca16c 100755
--- a/display/directfb/DETAILS
+++ b/display/directfb/DETAILS
@@ -5,7 +5,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Direct
SOURCE_URL[0]=http://www.directfb.org/download/DirectFB/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=LGPL
- BUILD_API=2
KEYWORDS="display"
WEB_SITE=http://www.directfb.org/
ENTERED=20030916
diff --git a/display/directfb/HISTORY b/display/directfb/HISTORY
index c53168b..42a96d0 100644
--- a/display/directfb/HISTORY
+++ b/display/directfb/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-05-09 Eric Sandall <eric AT sandall.us>
* DETAILS: Updated to 0.9.25.1
* gfxdrivers: radeon and r200 drivers are now combined
diff --git a/display/fbv/DETAILS b/display/fbv/DETAILS
index 6f60ccf..9dafb00 100755
--- a/display/fbv/DETAILS
+++ b/display/fbv/DETAILS
@@ -7,7 +7,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://s-tech.elsat.net.pl/fbv
ENTERED=20020217
UPDATED=20050403
- BUILD_API=2
LICENSE=GPL
KEYWORDS="display"
SHORT="Framebuffer image viewer"
diff --git a/display/fbv/HISTORY b/display/fbv/HISTORY
index 763fec6..b58dbb7 100644
--- a/display/fbv/HISTORY
+++ b/display/fbv/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/display/fresco/DETAILS b/display/fresco/DETAILS
index 2208902..594010f 100755
--- a/display/fresco/DETAILS
+++ b/display/fresco/DETAILS
@@ -16,7 +16,6 @@ fi
ENTERED=20030915
UPDATED=20030915
LICENSE[0]=LGPL
- BUILD_API=2
KEYWORDS="display"
SHORT="Windowing system originally based on InterViews"
cat << EOF
diff --git a/display/fresco/HISTORY b/display/fresco/HISTORY
index bc32c13..fde0ebd 100644
--- a/display/fresco/HISTORY
+++ b/display/fresco/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/display/libgii/DETAILS b/display/libgii/DETAILS
index efad8e2..aec9dc9 100755
--- a/display/libgii/DETAILS
+++ b/display/libgii/DETAILS
@@ -9,7 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
ENTERED=20020730
UPDATED=20040106
LICENSE[0]=MIT
- BUILD_API=2
DOCS="doc/*.txt FAQ NEWS README"
KEYWORDS="display"
SHORT="General Graphics Interface Infrastructure(?)"
diff --git a/display/libgii/HISTORY b/display/libgii/HISTORY
index c37af79..adacd49 100644
--- a/display/libgii/HISTORY
+++ b/display/libgii/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-04-22 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.0.1

diff --git a/display/qingy-themes/DETAILS b/display/qingy-themes/DETAILS
index 33eb2fc..ec22715 100755
--- a/display/qingy-themes/DETAILS
+++ b/display/qingy-themes/DETAILS
@@ -9,7 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/qingy_
ENTERED=20040203
UPDATED=20050407
LICENSE[0]=GPL
- BUILD_API=2
ARCHIVE="off"
KEYWORDS="display theme"
SHORT="Qingy themes"
diff --git a/display/qingy-themes/HISTORY b/display/qingy-themes/HISTORY
index dee0bc6..f90536d 100644
--- a/display/qingy-themes/HISTORY
+++ b/display/qingy-themes/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/display/qingy/DETAILS b/display/qingy/DETAILS
index 0727ea7..1c08b40 100755
--- a/display/qingy/DETAILS
+++ b/display/qingy/DETAILS
@@ -9,7 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
UPDATED=20060519
PATCHLEVEL=1
LICENSE[0]=GPL
- BUILD_API=2
KEYWORDS="framebuffer display"
SHORT="A login manager for DirectFB"
cat << EOF
diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY
index bab4cfb..fe3984a 100644
--- a/display/qingy/HISTORY
+++ b/display/qingy/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-05-29 David Kowis <dkowis AT shlrm.org>
* DEPENDS: added dependency on openssl per bug 12330

diff --git a/display/svgalib/DETAILS b/display/svgalib/DETAILS
index aa40c48..7b1d42c 100755
--- a/display/svgalib/DETAILS
+++ b/display/svgalib/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
ENTERED=20011117
UPDATED=20011117
LICENSE[0]=GPL
- BUILD_API=2
DOCS="0-README LICENSE README svgalib.lsm doc/0-INSTALL
doc/CHANGES doc/DESIGN doc/Driver-programming-HOWTO doc/dual-head-howto
doc/README.* doc/svgalib.lsm doc/TODO"
KEYWORDS="display"
SHORT="Graphics library to provide VGA and SVGA modes in a
console"
diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY
index e51d661..0839c0a 100644
--- a/display/svgalib/HISTORY
+++ b/display/svgalib/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-04-05 Juuso Alasuutari <iuso AT sourcemage.org>
* PRE_BUILD: sedits to build against sorcery kernel, not running
kernel: fixes bug #10820. also made 1 var local.
diff --git a/display/xdirectfb/BUILD b/display/xdirectfb/BUILD
index ac8a823..3344f4b 100755
--- a/display/xdirectfb/BUILD
+++ b/display/xdirectfb/BUILD
@@ -1,20 +1,17 @@
+message "Building xdirectfb takes a very long time." &&
+rm -f config/cf/host.def &&

-message "Building xdirectfb takes a very long time."
+if (echo $CFLAGS | grep -q -- "-Os"); then
+ export CFLAGS="-O2 ${CFLAGS//-Os/}"
+fi &&

-(
- rm -f config/cf/host.def
&&
+if spell_ok linux-pam; then
+ echo "#define HasPam YES" >> config/cf/site.def
+fi &&

- if (echo $CFLAGS | grep -q -- "-Os"); then
- export CFLAGS="-O2 ${CFLAGS//-Os/}"
- fi
&&
-
- if spell_ok linux-pam
- then echo "#define HasPam YES" >> config/cf/site.def
- fi
&&
-
- ### xdirectfb specific stuff
- cp $SOURCE_DIRECTORY/programs/Xserver/hw/xfree86/xf86Version.h
$SOURCE_DIRECTORY/ &&
- cp $SOURCE_DIRECTORY/programs/Xserver/hw/xfree86/xf86Date.h
$SOURCE_DIRECTORY/ &&
+### xdirectfb specific stuff
+cp $SOURCE_DIRECTORY/programs/Xserver/hw/xfree86/xf86Version.h
$SOURCE_DIRECTORY/ &&
+cp $SOURCE_DIRECTORY/programs/Xserver/hw/xfree86/xf86Date.h
$SOURCE_DIRECTORY/ &&
cat <<__EOF__ >config/cf/host.def

#define DefaultCCOptions $CFLAGS
@@ -45,87 +42,46 @@ #define BuildGLULibrary YES
#define BuildOSMesaLib YES
#define BuildXprint YES
__EOF__
- # end
+# end

- 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

diff --git a/display/xdirectfb/INSTALL b/display/xdirectfb/INSTALL
new file mode 100755
index 0000000..56d0bf4
--- /dev/null
+++ b/display/xdirectfb/INSTALL
@@ -0,0 +1,37 @@
+### 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
&&
+default_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
+
+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
diff --git a/display/xdirectfb/POST_INSTALL b/display/xdirectfb/POST_INSTALL
deleted file mode 100755
index 50eb3a0..0000000
--- a/display/xdirectfb/POST_INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-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/y/DETAILS b/display/y/DETAILS
index bc5196a..9fb4450 100755
--- a/display/y/DETAILS
+++ b/display/y/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Y-${
ENTERED=20040219
UPDATED=20040219
LICENSE[0]="LGPL GPL"
- BUILD_API=2
KEYWORDS="display"
SHORT="Successor to the X-Windowing System"
cat << EOF
diff --git a/display/y/HISTORY b/display/y/HISTORY
index 9e50c66..d97eaf2 100644
--- a/display/y/HISTORY
+++ b/display/y/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS




  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (39c66220a18933fc63d92528cebb0951db530eef), Eric Sandall, 06/29/2006

Archive powered by MHonArc 2.6.24.

Top of Page