[oe-commits] org.oe.dev merge of '18293653fb0ec41c60cab9ca36df1dd7c1834880'
pfalcon commit
oe at amethyst.openembedded.net
Mon Mar 17 08:57:05 UTC 2008
merge of '18293653fb0ec41c60cab9ca36df1dd7c1834880'
and 'b54f849e3abe2877a2579b6348c60e2c6c1a08ca'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 4a44b08ef83a5075a82f85c34d592996acfcec95
ViewMTN: http://monotone.openembedded.org/revision/info/4a44b08ef83a5075a82f85c34d592996acfcec95
Files:
1
packages/linux/linux-handhelds-2.6-2.6.21/keep-initramfs.patch
packages/linux/linux-handhelds-2.6.inc
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
packages/gcc/gcc-4.1.0
packages/gpsdrive/gpsdrive_2.10pre3.bb
packages/gpsdrive/gpsdrive_cvs.bb
packages/linux/linux-openmoko-devel
packages/netbase/netbase/ghi270
packages/sqlite/sqlite3-3.3.17
packages/sqlite/sqlite3-3.4.1
packages/tslib/tslib-1.0
packages/espeak/espeak_1.30.bb
packages/espeak/espeak_1.35.bb
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/speech-dispatcher/speech-dispatcher_0.6.6.bb
packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch
packages/xorg-xserver/files/pkgconfig_fix.patch
packages/cellwriter
packages/xorg-xserver/xserver-xorg-1.4
packages/cellwriter/cellwriter_1.3.3.bb
packages/espeak/espeak-data_1.35.bb
packages/espeak/espeak.inc
packages/gnash/gnash_0.8.2.bb
packages/gpsdrive/gpsdrive.inc
packages/kismet/kismet-2007-10-R1/fix_strip.patch
packages/smartmontools/smartmontools_5.38.bb
packages/xorg-driver/xf86-video-ati_6.8.0.bb
packages/xorg-driver/xf86-video-intel_2.2.1.bb
packages/xorg-lib/libxext_1.0.4.bb
packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch
packages/xorg-xserver/xserver-xorg_1.4.bb
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/include/preferred-xorg-versions-X11R7.4.inc
packages/alsa/alsa-state/fic-gta01/asound.state
packages/alsa/alsa-state/fic-gta01/capturehandset.state
packages/alsa/alsa-state/fic-gta01/captureheadset.state
packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
packages/alsa/alsa-state/fic-gta01/gsmhandset.state
packages/alsa/alsa-state/fic-gta01/gsmheadset.state
packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state
packages/alsa/alsa-state/fic-gta01/stereoout.state
packages/alsa/alsa-state/fic-gta01/voip-handset.state
packages/alsa/alsa-state/fic-gta01/voip-headset.state
packages/directfb/++dfb_1.0.0.bb
packages/directfb/directfb-examples_1.0.0.bb
packages/freesmartphone/gsm0710muxd_svn.bb
packages/gpsdrive/files/gpsdrive.desktop
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
packages/gpsdrive/gpsdrive-pda_2.10pre2.bb
packages/gpsdrive/gpsdrive_2.10pre2.bb
packages/gpsdrive/gpsdrive_2.10pre4.bb
packages/gtk+/gtk+.inc
packages/images/opie-image-16mb.bb
packages/images/opie-image.bb
packages/keymaps/files/poodle/keymap-2.6.map
packages/keymaps/keymaps_1.0.bb
packages/tasks/task-gpe.bb
packages/tasks/task-openmoko-feed.bb
Diffs:
#
# mt diff -r18293653fb0ec41c60cab9ca36df1dd7c1834880 -r4a44b08ef83a5075a82f85c34d592996acfcec95
#
#
#
# delete "packages/linux/linux-handhelds-2.6-2.6.21/keep-initramfs.patch"
#
# patch "packages/linux/linux-handhelds-2.6.inc"
# from [98a6f0f9f040fedbfaf3ba13c0c39685da9f4c34]
# to [6ee762ca50690741aee1b59934653c4e6899f3ff]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
# from [77d66be7e651da29ca286c2f28474b976270f746]
# to [358d89b41f8bf41044bf9fb95edf85da0b2238b9]
#
============================================================
--- packages/linux/linux-handhelds-2.6.inc 98a6f0f9f040fedbfaf3ba13c0c39685da9f4c34
+++ packages/linux/linux-handhelds-2.6.inc 6ee762ca50690741aee1b59934653c4e6899f3ff
@@ -38,6 +38,11 @@ do_configure() {
fi
if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then
+ if [ ! -f ${KERNEL_INITRAMFS_PATH} ]; then
+ echo "${KERNEL_INITRAMFS_PATH} does not exist, you may need to bitbake it separately"
+ exit 1
+ fi
+
# Kernel expects non-compressed cpio
gzip -d -c ${KERNEL_INITRAMFS_PATH} >${WORKDIR}/initramfs.cpio
echo "CONFIG_INITRAMFS_SOURCE=\"${WORKDIR}/initramfs.cpio\"" >> ${S}/.config
============================================================
--- packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb 77d66be7e651da29ca286c2f28474b976270f746
+++ packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb 358d89b41f8bf41044bf9fb95edf85da0b2238b9
@@ -1,7 +1,7 @@ LICENSE = "GPL"
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
LICENSE = "GPL"
-PR = "r19"
+PR = "r20"
DEFAULT_PREFERENCE = "-1"
#
# mt diff -rb54f849e3abe2877a2579b6348c60e2c6c1a08ca -r4a44b08ef83a5075a82f85c34d592996acfcec95
#
#
#
# delete "packages/gcc/gcc-4.1.0"
#
# delete "packages/gpsdrive/gpsdrive_2.10pre3.bb"
#
# delete "packages/gpsdrive/gpsdrive_cvs.bb"
#
# delete "packages/linux/linux-openmoko-devel"
#
# delete "packages/netbase/netbase/ghi270"
#
# delete "packages/sqlite/sqlite3-3.3.17"
#
# delete "packages/sqlite/sqlite3-3.4.1"
#
# delete "packages/tslib/tslib-1.0"
#
# rename "packages/espeak/espeak_1.30.bb"
# to "packages/espeak/espeak_1.35.bb"
#
# rename "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
# to "packages/speech-dispatcher/speech-dispatcher_0.6.6.bb"
#
# rename "packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch"
# to "packages/xorg-xserver/files/pkgconfig_fix.patch"
#
# add_dir "packages/cellwriter"
#
# add_dir "packages/xorg-xserver/xserver-xorg-1.4"
#
# add_file "packages/cellwriter/cellwriter_1.3.3.bb"
# content [11268567720a1dc301d27fce9d15bb615fe22c15]
#
# add_file "packages/espeak/espeak-data_1.35.bb"
# content [7becc9c9407d3352c52b70e1f4b0767352dee83c]
#
# add_file "packages/espeak/espeak.inc"
# content [a507092611114c379d686d2b8713c52898a66709]
#
# add_file "packages/gnash/gnash_0.8.2.bb"
# content [50014de2c3904a6950c775be0eda4815399cb573]
#
# add_file "packages/gpsdrive/gpsdrive.inc"
# content [5f8c0acff5d8cf63f4811596ed94872a5194ae27]
#
# add_file "packages/kismet/kismet-2007-10-R1/fix_strip.patch"
# content [c31f1cc54913e7c37106d3839b7afa75d9a3fae7]
#
# add_file "packages/smartmontools/smartmontools_5.38.bb"
# content [90c136f161e80e9c22e057a4e7a40eafeedd513b]
#
# add_file "packages/xorg-driver/xf86-video-ati_6.8.0.bb"
# content [8dfbd6e912eac11000c7b5fa1970558b0195c15b]
#
# add_file "packages/xorg-driver/xf86-video-intel_2.2.1.bb"
# content [427082621e76e5e4f3c00aa6b62d40dccdfca10e]
#
# add_file "packages/xorg-lib/libxext_1.0.4.bb"
# content [1ba6633f30846522b2b92eac4e9faacba43b4b7e]
#
# add_file "packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch"
# content [1f677919202395a75968515302a556e50edaa142]
#
# add_file "packages/xorg-xserver/xserver-xorg_1.4.bb"
# content [390cc0513bf74cbc87ed0298fcaf45b4df70d20b]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [e862f6042ce71dd536cb1abf60132cdda2d229ea]
# to [45c4fabe80b7601dd86c45ad8f64a6773594d4e7]
#
# patch "conf/distro/include/preferred-xorg-versions-X11R7.4.inc"
# from [1c80460587c91260a4733ef34bf4747aef7fc19b]
# to [17d27ab037e214a22a7c37db724aa5bc7e319434]
#
# patch "packages/alsa/alsa-state/fic-gta01/asound.state"
# from [1caaafe9a0c00ae1dd0487d2cbb65dd85e68c043]
# to [24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28]
#
# patch "packages/alsa/alsa-state/fic-gta01/capturehandset.state"
# from [3d006b5dd4cd49bd5200ef7265aea7707a94742d]
# to [e9daf2ba483a71ce163925f4f8123f9b21fae829]
#
# patch "packages/alsa/alsa-state/fic-gta01/captureheadset.state"
# from [8d61d9d7df8eeca1b6d6b869e34092846cd6255d]
# to [c2a0fa104836312145b8705962462a0ab4f9049a]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state"
# from [3675af3b763a03a1931c72f602dcf9c10785d352]
# to [8f6dd94826572a3e21eb710a31de17c94b4ff6e5]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmhandset.state"
# from [e26913ea8ef767872f2a1bed7529a897a38a0528]
# to [88e380e6c174c2c8e0d067f5f3bf5cc23d9279a9]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmheadset.state"
# from [81f4f5e844fcec82dba762247aa29f3d0fcb49d7]
# to [d136d1e7e79a80885e9b7a0a03c442fdc032cc61]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state"
# from [bd1a1a0426f6ee33355f8a327e980e6dfea4b84e]
# to [534365ba106105f05e94a03aea74c9c6da59a017]
#
# patch "packages/alsa/alsa-state/fic-gta01/stereoout.state"
# from [1caaafe9a0c00ae1dd0487d2cbb65dd85e68c043]
# to [24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28]
#
# patch "packages/alsa/alsa-state/fic-gta01/voip-handset.state"
# from [c5b60d82c1897991c9945ce182c4b0ffca5a9d12]
# to [4d28d6e6a2f7c934263fadf690327fe6208168fd]
#
# patch "packages/alsa/alsa-state/fic-gta01/voip-headset.state"
# from [6e7478155fdc57345e3112db7c8de2755a5e931e]
# to [9693cce22afbd9cb814e2f71ff566df3306c8649]
#
# patch "packages/directfb/++dfb_1.0.0.bb"
# from [6b7e64ea5aad23f2f67999472f1538a27add97e4]
# to [a3a28b844e6601187428c14c8ff87def4ee6a800]
#
# patch "packages/directfb/directfb-examples_1.0.0.bb"
# from [1905769a0ea0cc18c68ea7969adaa55fe65ad9aa]
# to [8e765a6e6dcdbbd584d7dd2b3df4eb881390dd44]
#
# patch "packages/espeak/espeak_1.35.bb"
# from [a8eccd7e70daf05d588bdf9ab26438a62a6dfe71]
# to [99110f31d07c43a9c50c4b73f3f9e537eb552319]
#
# patch "packages/freesmartphone/gsm0710muxd_svn.bb"
# from [c35675feeab41300a896a61eea7ae16bcb3b4c81]
# to [fca26930e46528d65ce3fd112b6e902e62df38f0]
#
# patch "packages/gpsdrive/files/gpsdrive.desktop"
# from [3ed787c2d437f213fb2d28b7fe9bcc9feac2cfa7]
# to [3abd06e7721592808a5ecab632fd527bf57b2d29]
#
# patch "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
# from [6ef8f7d5db97dd3541a0bfe44325bd07296baf1b]
# to [cddc5f1f7eb5adf78aaad3610fccaddcf0616dfc]
#
# patch "packages/gpsdrive/gpsdrive-pda_2.10pre2.bb"
# from [29c061374aefcc591a87829d659fc50cdc3acefa]
# to [059b9eb48f476a17434ac0532e14eca6bb1b8ae2]
#
# patch "packages/gpsdrive/gpsdrive_2.10pre2.bb"
# from [29a714e888f2ef1c714628caa9619d49cfc6609b]
# to [45654d0e7c03d8edde1c51eec731eee66b9e2ca3]
#
# patch "packages/gpsdrive/gpsdrive_2.10pre4.bb"
# from [8019316f995c6928f922a1b2412b7393fe8599f3]
# to [9e4cea32b63aa093d54c9b1039cfa8dd87790322]
#
# patch "packages/gtk+/gtk+.inc"
# from [328403e10a5ff78ea6fa90afb26faaa2e137947a]
# to [1aaf588548db151300913d0a15d5cc12dc7cdaa8]
#
# patch "packages/images/opie-image-16mb.bb"
# from [1228a8f171a2b91c0604a288575a91fcdf3d258c]
# to [ed0f6ec0f38f046617e1c0af7ed306296c4bb02b]
#
# patch "packages/images/opie-image.bb"
# from [a1c62875ee2fbe52f0ba014c4931559c768b671c]
# to [aedacdeb41ac211eb9913ed1489c3c998bbb6b17]
#
# patch "packages/keymaps/files/poodle/keymap-2.6.map"
# from [00f12c709c25cad65763fdacfa9fb1dc57c0276d]
# to [10300a18cbec492a94d688f515fa7a4fbbbe00a3]
#
# patch "packages/keymaps/keymaps_1.0.bb"
# from [2d6266f5fb78a16a46e9db710994964cdf8aecec]
# to [30c7477adcffd4ee16488b6541923f63e618f258]
#
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.6.bb"
# from [234b25c309b6b52f26d9fb1a049e4227b90ba438]
# to [a925ce6224d9321377cd2532c8d0678d21df0710]
#
# patch "packages/tasks/task-gpe.bb"
# from [6d67c2a586f7786deaf06a8760041f2b4f96e72e]
# to [f5d47e2ca157f2b70c133683212506cd5e360c01]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [1d446b5d0ff09d916f1a0edd5acc3f1b3fbd6d21]
# to [e5d503f24f4dc2f152faa954b5f08c8fe0538f9e]
#
# patch "packages/xorg-xserver/files/pkgconfig_fix.patch"
# from [c63f18a7b52ed2a806647ca314ea5f8e3bcf08f2]
# to [901ea1fce771604e7c73a41df2ee265efa81dc53]
#
============================================================
--- packages/cellwriter/cellwriter_1.3.3.bb 11268567720a1dc301d27fce9d15bb615fe22c15
+++ packages/cellwriter/cellwriter_1.3.3.bb 11268567720a1dc301d27fce9d15bb615fe22c15
@@ -0,0 +1,13 @@
+DESCRIPTION = "A grid-entry natural handwriting input panel"
+SECTION = "x11/input"
+AUTHOR = "Michael Levin"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libxtst"
+
+SRC_URI = "http://pub.risujin.org/cellwriter/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-gnome"
+
+FILES_${PN} += "${datadir}/icons"
============================================================
--- packages/espeak/espeak-data_1.35.bb 7becc9c9407d3352c52b70e1f4b0767352dee83c
+++ packages/espeak/espeak-data_1.35.bb 7becc9c9407d3352c52b70e1f4b0767352dee83c
@@ -0,0 +1,30 @@
+require espeak.inc
+
+PR = "r0"
+
+inherit native
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${layout_datadir}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+TARGET_ARCH = "${MACHINE_ARCH}"
+
+do_compile() {
+ # Fixing byte order of phoneme data files
+ cd "${S}/platforms/big_endian"
+ sed -i '/^ *CC *=/d' Makefile
+ sed -i 's/\(.*BYTE_ORDER\)/#undef BYTE_ORDER\n#define BYTE_ORDER BIG_ENDIAN\n\1/' espeak-phoneme-data.c
+ oe_runmake
+ ./espeak-phoneme-data "${S}/espeak-data"
+ cp -f phondata phonindex phontab "${S}/espeak-data"
+}
+
+do_install() {
+ install -d ${D}${layout_datadir}/espeak-data
+ install -m 0644 ${S}/espeak-data/phon* ${D}${layout_datadir}/espeak-data
+}
+
+do_stage() {
+ :
+}
============================================================
--- packages/espeak/espeak.inc a507092611114c379d686d2b8713c52898a66709
+++ packages/espeak/espeak.inc a507092611114c379d686d2b8713c52898a66709
@@ -0,0 +1,7 @@
+DESCRIPTION = "eSpeak is a compact open source software speech synthesizer"
+SECTION = "base"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip"
+
+S = "${WORKDIR}/espeak-${PV}-source"
============================================================
--- packages/gnash/gnash_0.8.2.bb 50014de2c3904a6950c775be0eda4815399cb573
+++ packages/gnash/gnash_0.8.2.bb 50014de2c3904a6950c775be0eda4815399cb573
@@ -0,0 +1 @@
+require gnash.inc
============================================================
--- packages/gpsdrive/gpsdrive.inc 5f8c0acff5d8cf63f4811596ed94872a5194ae27
+++ packages/gpsdrive/gpsdrive.inc 5f8c0acff5d8cf63f4811596ed94872a5194ae27
@@ -0,0 +1,25 @@
+DESCRIPTION = "GPS navigation/map display software"
+HOMEPAGE = "http://www.gpsdrive.de/"
+AUTHOR = ""Fritz Ganter gpsdrive at warbase.selwerd.nl"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc gtk+ libpcre gpsd"
+RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-garmin"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+do_install_append() {
+ mkdir -p ${D}${datadir}/applications
+ install -m 0644 ${WORKDIR}/*.desktop ${D}${datadir}/applications/gpsdrive.desktop
+
+ # gpsd is provided by RDEPENDS
+ if test -e ${D}${bindir}/gpsd
+ then
+ rm ${D}${bindir}/gpsd
+ fi
+}
============================================================
--- packages/kismet/kismet-2007-10-R1/fix_strip.patch c31f1cc54913e7c37106d3839b7afa75d9a3fae7
+++ packages/kismet/kismet-2007-10-R1/fix_strip.patch c31f1cc54913e7c37106d3839b7afa75d9a3fae7
@@ -0,0 +1,47 @@
+Index: kismet-2007-10-R1/Makefile.in
+===================================================================
+--- kismet-2007-10-R1.orig/Makefile.in 2008-03-06 15:20:37.000000000 +0000
++++ kismet-2007-10-R1/Makefile.in 2008-03-06 15:21:07.000000000 +0000
+@@ -138,23 +138,23 @@
+ fi
+
+ binuserinstall:
+- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS);
+- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE);
++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS);
++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE);
+
+ binsuidinstall:
+- install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS);
+- install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE);
++ install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(PS) $(BIN)/$(PS);
++ install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(DRONE) $(BIN)/$(DRONE);
+
+ commoninstall:
+ mkdir -p $(ETC)
+ mkdir -p $(BIN)
+
+ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(WRAP) $(BIN)/kismet
+- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC)
+- # install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER)
++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC)
++ # install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(HOPPER) $(BIN)/$(HOPPER)
+ @if test "$(ZAURUS)" = "yes"; then \
+- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
+- echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \
++ echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \
+ fi
+ #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor
+ #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor
+@@ -169,8 +169,8 @@
+ install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
+
+ @if test "$(GPSLBUILD)" = "$(GPSL)"; then \
+- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
+- echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \
++ echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \
+ install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
+ echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
+ install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
============================================================
--- packages/smartmontools/smartmontools_5.38.bb 90c136f161e80e9c22e057a4e7a40eafeedd513b
+++ packages/smartmontools/smartmontools_5.38.bb 90c136f161e80e9c22e057a4e7a40eafeedd513b
@@ -0,0 +1 @@
+include smartmontools.inc
============================================================
--- packages/xorg-driver/xf86-video-ati_6.8.0.bb 8dfbd6e912eac11000c7b5fa1970558b0195c15b
+++ packages/xorg-driver/xf86-video-ati_6.8.0.bb 8dfbd6e912eac11000c7b5fa1970558b0195c15b
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- ATI display driver"
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
============================================================
--- packages/xorg-driver/xf86-video-intel_2.2.1.bb 427082621e76e5e4f3c00aa6b62d40dccdfca10e
+++ packages/xorg-driver/xf86-video-intel_2.2.1.bb 427082621e76e5e4f3c00aa6b62d40dccdfca10e
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
============================================================
--- packages/xorg-lib/libxext_1.0.4.bb 1ba6633f30846522b2b92eac4e9faacba43b4b7e
+++ packages/xorg-lib/libxext_1.0.4.bb 1ba6633f30846522b2b92eac4e9faacba43b4b7e
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau"
+PROVIDES = "xext"
+PE = "1"
+
+XORG_PN = "libXext"
============================================================
--- packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch 1f677919202395a75968515302a556e50edaa142
+++ packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch 1f677919202395a75968515302a556e50edaa142
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200
++++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100
+@@ -41,7 +41,7 @@
+
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
============================================================
--- packages/xorg-xserver/xserver-xorg_1.4.bb 390cc0513bf74cbc87ed0298fcaf45b4df70d20b
+++ packages/xorg-xserver/xserver-xorg_1.4.bb 390cc0513bf74cbc87ed0298fcaf45b4df70d20b
@@ -0,0 +1,14 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman"
+PE = "1"
+
+SRC_URI += "file://drmfix.patch;patch=1 \
+ file://pkgconfig_fix.patch;patch=1"
+
+MESA_VER = "7.0.2"
+
+EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
+
+export LDFLAGS += " -ldl "
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc e862f6042ce71dd536cb1abf60132cdda2d229ea
+++ conf/distro/include/preferred-om-2008-versions.inc 45c4fabe80b7601dd86c45ad8f64a6773594d4e7
@@ -2,7 +2,7 @@ PREFERR%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list