diff options
20 files changed, 269 insertions, 76 deletions
diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass index e0a4ccf133..45812bbb81 100644 --- a/classes/rm_work.bbclass +++ b/classes/rm_work.bbclass @@ -28,4 +28,4 @@ do_rm_work_all () { : } do_rm_work_all[recrdeptask] = "do_rm_work" -addtask rm_work_all +addtask rm_work_all after do_rm_work diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index b450c07df7..eabb2d7def 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -145,3 +145,19 @@ IGNORE_STRIP_ERRORS = "" #PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225" PREFERRED_VERSION_linux-libc-headers = "2.6.18" + +# we don't ship gtk-directfb by default +PREFERRED_PROVIDER_gtk+ ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-gif ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ico ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-png ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-ras ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-tga ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" +PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" diff --git a/packages/apex/apex-nslu2-16mb_1.5.8.bb b/packages/apex/apex-nslu2-16mb_1.5.8.bb index e5bf98a6c8..abdc188ecf 100644 --- a/packages/apex/apex-nslu2-16mb_1.5.8.bb +++ b/packages/apex/apex-nslu2-16mb_1.5.8.bb @@ -3,7 +3,7 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -# PR = "r1" +PR = "r1" # Note that this recipe only works for the NSLU2 at the moment. # Patches to make it more generic are welcome. @@ -20,6 +20,8 @@ CMDLINE_ROOT_nslu2 = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc" CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc" CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc" +CMDLINE_DEBUG ?= "" + EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" oe_runmake() { diff --git a/packages/apex/apex-nslu2_1.5.8.bb b/packages/apex/apex-nslu2_1.5.8.bb index 6ed2d20518..6c2b7ccd63 100644 --- a/packages/apex/apex-nslu2_1.5.8.bb +++ b/packages/apex/apex-nslu2_1.5.8.bb @@ -3,7 +3,7 @@ SECTION = "" PRIORITY = "optional" HOMEPAGE = "http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader" LICENSE = "GPL" -# PR = "r1" +PR = "r1" # Note that this recipe only works for the NSLU2 at the moment. # Patches to make it more generic are welcome. @@ -20,6 +20,8 @@ CMDLINE_ROOT_nslu2 = "root=/dev/mtdblock4 rootfstype=jffs2 rw init=/linuxrc" CMDLINE_ROOT_dsmg600 = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc" CMDLINE_ROOT_nas100d = "root=/dev/mtdblock2 rootfstype=jffs2 rw init=/linuxrc" +CMDLINE_DEBUG ?= "" + EXTRA_OEMAKE_append = " CROSS_COMPILE=${CROSS_DIR}/bin/${HOST_PREFIX}" oe_runmake() { diff --git a/packages/duma/.mtn2git_empty b/packages/duma/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/duma/.mtn2git_empty diff --git a/packages/duma/duma_2.5.7.bb b/packages/duma/duma_2.5.7.bb new file mode 100644 index 0000000000..d4bc416234 --- /dev/null +++ b/packages/duma/duma_2.5.7.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "A Red-Zone memory allocator to detect unintended memory access" +HOMEPAGE = "http://duma.sourceforge.net" +LICENSE = "GPL LGPL" +SECTION = "devel" +DEPENDS = "qemu-native" + +SRC_URI = "${SOURCEFORGE_MIRROR}/duma/duma_2_5_7.tar.gz" + +S = "${WORKDIR}/duma_2_5_7" + +EXTRA_OECONF = "-e" + +do_configure () { + oe_runmake createconf + qemu-${TARGET_ARCH} -L ${STAGING_DIR}/${HOST_SYS} ./createconf +} + +do_compile () { + oe_runmake libduma.a libduma.so.0.0 +} + +do_install () { + install -d ${D}${base_bindir} + install -d ${D}${base_libdir} + install -d ${D}${mandir}/man3 + oe_runmake install prefix="${D}" MAN_INSTALL_DIR="${D}${mandir}/man3" +} diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index fafd6202c1..2125773569 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -22,6 +22,7 @@ SLUGOS_PACKAGES = "\ alsa-lib \ alsa-utils \ apex-env \ + apr \ asterisk \ asterisk-sounds \ atftp \ @@ -36,6 +37,8 @@ SLUGOS_PACKAGES = "\ binutils \ bison \ bluez-utils \ + bogofilter \ + boost \ bridge-utils \ bzip2 \ ccxstream \ @@ -61,7 +64,6 @@ SLUGOS_PACKAGES = "\ expat \ ez-ipupdate \ fconfig \ - fetchmail \ file \ findutils \ fis \ @@ -77,32 +79,39 @@ SLUGOS_PACKAGES = "\ glib-2.0 \ gnu-config \ grep \ + groff \ gspcav1 \ gtk-doc \ gzip \ hdparm \ ifupdown \ + iperf \ ipkg-utils \ iptables \ ircp \ + irssi \ joe \ jpeg \ lcdproc \ less \ libao \ libdvb \ + libexif \ libid3tag \ liblockfile \ libmad \ libmikmod \ libogg \ libol \ + libpam \ + libpcre \ libpng \ libtool \ libupnp \ libusb \ libvorbis \ libxml2 \ + linphone \ litestream \ lrzsz \ lsof \ @@ -112,22 +121,27 @@ SLUGOS_PACKAGES = "\ madwifi-ng \ mailx \ make \ + man man-pages \ masqmail \ mdadm \ + mediatomb \ memtester \ mgetty \ miau \ microcom \ minicom \ motion \ + mpd \ mt-daapd \ mtd-utils \ mutt \ + mysql \ nail \ nano \ ncftp \ ncurses \ netcat \ + netpbm \ nfs-utils \ nmap \ ntfs-3g \ @@ -136,19 +150,20 @@ SLUGOS_PACKAGES = "\ obexftp \ obexpush \ openobex-apps \ - openldap \ openntpd \ openobex \ openssh \ openvpn \ patch \ pciutils \ - libpcre \ perl \ picocom \ pkgconfig \ + popt \ + postfix \ ppp \ procps \ + psmisc \ puppy \ python \ quilt \ @@ -156,6 +171,7 @@ SLUGOS_PACKAGES = "\ rng-tools \ rsync \ samba \ + screen \ sed \ setpwc \ setserial \ @@ -165,15 +181,18 @@ SLUGOS_PACKAGES = "\ ssmtp \ strace \ streamripper \ + sudo \ sysfsutils \ tar \ task-mokogateway-everything \ thttpd \ tiff \ + timezones \ tzdata \ unzip \ upslug2 \ usbutils \ + ushare \ util-linux \ vim \ vlan \ @@ -186,6 +205,10 @@ SLUGOS_PACKAGES = "\ wireless-tools \ wireshark \ wpa-supplicant \ + wview-sim wview-vpro wview-wxt510 \ + xinetd \ + yeaphone \ + yp-tools ypbind ypserv \ zd1211-firmware \ zip \ zlib \ @@ -194,76 +217,24 @@ SLUGOS_PACKAGES = "\ # Packages currently broken on all platforms SLUGOS_BROKEN_PACKAGES = "\ bwmon \ - gphoto2 \ - irssi \ - libgphoto2 \ + ctrlproxy \ + dsniff \ + fetchmail \ + libgphoto2 gphoto2 sane-backends \\ + lirc-modules lirc \ logrotate \ madfu \ - mediatomb \ - mpd \ - netpbm \ + openldap \ pvrusb2-mci \ + pwc \ qc-usb-messenger \ syslog-ng \ - sane-backends \ + task-native-sdk \ unionfs-modules \ unionfs-utils \ - lirc \ - pwc \ - task-native-sdk \ - zd1211 \ - mysql \ wview-sim-mysql wview-vpro-mysql \ wview-wxt510-mysql \ - " - -# These packages will never build because uclibc lacks (and always will lack) -# appropriate support. This define is for documentation of this fact! The -# normal cause is that the package uses the "NIS" interfaces (once known as -# YP - a trademark of BT which SUN used without license - the missing function -# calls often still have 'yp' in the name). - -# NOTE: rng-tools is only here until argp-standalone can be built! -# nfs-utils \ - -UCLIBC_UNSUPPORTABLE_PACKAGES = "\ - libpam \ - rng-tools \ - postfix \ - yp-tools ypbind ypserv \ - " - -# These packages work with glibc, but break on uclibc. -# erlang \ - -UCLIBC_BROKEN_PACKAGES = "\ - apr \ - bogofilter \ - boost \ - linphone \ - yeaphone \ - sudo \ - ushare \ - " - -# Packages which build only with glibc (some of these use internal -# glibc functions and so will probably never run on uclibc). -SLUGOS_PACKAGES_append_linux = "\ - ${UCLIBC_UNSUPPORTABLE_PACKAGES} \ - ${UCLIBC_BROKEN_PACKAGES} \ - ctrlproxy \ - dsniff \ - iperf \ - groff \ - man man-pages \ - psmisc \ - screen \ - timezones \ - wview-sim wview-vpro wview-wxt510 \ - xinetd \ - " - -SLUGOS_PACKAGES_append_linux-uclibc = "\ + zd1211 \ " SLUGOS_EXTRA_PACKAGES ?= "" diff --git a/packages/net-snmp/net-snmp-5.4.1/configure-tail.patch b/packages/net-snmp/net-snmp-5.4.1/configure-tail.patch new file mode 100644 index 0000000000..89f9309535 --- /dev/null +++ b/packages/net-snmp/net-snmp-5.4.1/configure-tail.patch @@ -0,0 +1,99 @@ +diff -urN net-snmp-5.4.1-orig/acinclude.m4 net-snmp-5.4.1-patched/acinclude.m4 +--- net-snmp-5.4.1-orig/acinclude.m4 2006-08-15 05:25:49.000000000 +0200 ++++ net-snmp-5.4.1-patched/acinclude.m4 2007-08-14 13:22:13.000000000 +0200 +@@ -39,7 +39,7 @@ + dnl + AC_DEFUN([AC_PROMPT_USER], + [ +-MSG_CHECK=`echo "$2" | tail -1` ++MSG_CHECK=`echo "$2" | tail -n 1` + AC_CACHE_CHECK($MSG_CHECK, ac_cv_user_prompt_$1, + [echo "" >&AC_FD_MSG + AC_PROMPT_USER_NO_DEFINE($1,[$2],$3) +diff -urN net-snmp-5.4.1-orig/configure net-snmp-5.4.1-patched/configure +--- net-snmp-5.4.1-orig/configure 2007-07-27 19:04:19.000000000 +0200 ++++ net-snmp-5.4.1-patched/configure 2007-08-14 13:22:13.000000000 +0200 +@@ -26417,7 +26417,7 @@ + # hpux make (at least) doesn't like a trailing \ on the last + # line even when the next line contains nothing but + # whitespace. +- lasttoken=`tail -1 mk/$i.mk | awk '{print $1}'` ++ lasttoken=`tail -n 1 mk/$i.mk | awk '{print $1}'` + sed "s#$lasttoken \\\\#$lasttoken#" < mk/$i.mk > mk/$i.mk.tmp + mv mk/$i.mk.tmp mk/$i.mk + +@@ -48793,7 +48793,7 @@ + + ME=`$WHOAMI` + if test -f /etc/resolv.conf; then +- LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'` ++ LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n 1 | awk '{print $NF}'` + else + LOC="@no.where" + fi +@@ -48819,7 +48819,7 @@ + Providing the --with-default-snmp-version=\"x\" parameter to ./configure + will avoid this prompt. + +-Default version of SNMP to use" | tail -1` ++Default version of SNMP to use" | tail -n 1` + echo "$as_me:$LINENO: checking $MSG_CHECK" >&5 + echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6 + if test "${ac_cv_user_prompt_NETSNMP_DEFAULT_SNMP_VERSION+set}" = set; then +@@ -48903,7 +48903,7 @@ + Providing the --with-sys-contact=\"contact\" parameter to ./configure + will avoid this prompt. + +-System Contact Information" | tail -1` ++System Contact Information" | tail -n 1` + echo "$as_me:$LINENO: checking $MSG_CHECK" >&5 + echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6 + if test "${ac_cv_user_prompt_NETSNMP_SYS_CONTACT+set}" = set; then +@@ -48967,7 +48967,7 @@ + Providing the --with-sys-location=\"location\" parameter to ./configure + will avoid this prompt. + +-System Location" | tail -1` ++System Location" | tail -n 1` + echo "$as_me:$LINENO: checking $MSG_CHECK" >&5 + echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6 + if test "${ac_cv_user_prompt_NETSNMP_SYS_LOC+set}" = set; then +@@ -49037,7 +49037,7 @@ + Providing the --with-logfile=\"path\" parameter to ./configure + will avoid this prompt. + +-Location to write logfile" | tail -1` ++Location to write logfile" | tail -n 1` + echo "$as_me:$LINENO: checking $MSG_CHECK" >&5 + echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6 + if test "${ac_cv_user_prompt_NETSNMP_LOGFILE+set}" = set; then +@@ -49114,7 +49114,7 @@ + Providing the --with-persistent-directory=\"path\" parameter to + ./configure will avoid this prompt. + +-Location to write persistent information" | tail -1` ++Location to write persistent information" | tail -n 1` + echo "$as_me:$LINENO: checking $MSG_CHECK" >&5 + echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6 + if test "${ac_cv_user_prompt_NETSNMP_PERSISTENT_DIRECTORY+set}" = set; then +diff -urN net-snmp-5.4.1-orig/configure.in net-snmp-5.4.1-patched/configure.in +--- net-snmp-5.4.1-orig/configure.in 2007-07-27 19:02:00.000000000 +0200 ++++ net-snmp-5.4.1-patched/configure.in 2007-08-14 13:22:13.000000000 +0200 +@@ -2465,7 +2465,7 @@ + # hpux make (at least) doesn't like a trailing \ on the last + # line even when the next line contains nothing but + # whitespace. +- lasttoken=`tail -1 mk/$i.mk | awk '{print $1}'` ++ lasttoken=`tail -n 1 mk/$i.mk | awk '{print $1}'` + sed "s#$lasttoken \\\\#$lasttoken#" < mk/$i.mk > mk/$i.mk.tmp + mv mk/$i.mk.tmp mk/$i.mk + +@@ -4575,7 +4575,7 @@ + + ME=`$WHOAMI` + if test -f /etc/resolv.conf; then +- LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'` ++ LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n 1 | awk '{print $NF}'` + else + LOC="@no.where" + fi diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb index 80d5d26f09..c63738a912 100644 --- a/packages/openmoko2/openmoko-contacts2_svn.bb +++ b/packages/openmoko2/openmoko-contacts2_svn.bb @@ -1,8 +1,9 @@ -DESCRIPTION = "The OpenMoko address book" +DESCRIPTION = "The OpenMoko Address Book" SECTION = "openmoko/pim" +DEPENDS = "libmokoui2 libmokojournal2 dbus-glib" RDEPENDS = "libedata-book" PV = "0.1.0+svn${SVNREV}" -PR = "r2" +PR = "r4" inherit openmoko2 diff --git a/packages/scummvm/files/fic-gta01/.mtn2git_empty b/packages/scummvm/files/fic-gta01/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/scummvm/files/fic-gta01/.mtn2git_empty diff --git a/packages/scummvm/files/fic-gta01/openmoko-scummvm b/packages/scummvm/files/fic-gta01/openmoko-scummvm new file mode 100755 index 0000000000..e8c5cb3984 --- /dev/null +++ b/packages/scummvm/files/fic-gta01/openmoko-scummvm @@ -0,0 +1,19 @@ +#!/bin/sh + +# Save current AUX Key mapping +SAVE_KEY="$(xmodmap -pke | grep 'keycode 8')" + +# Map AUX Key to F5 +xmodmap -e "keycode 8 = F5" + +# Turn LCD feft +xrandr -o left + +# Start the scummvm in fullscreen mode +scummvm --fullscreen --themepath=/usr/share/scummvm/ + +# Turn LCD normal +xrandr -o normal + +# Restore the AUX Key mapping +xmodmap -e "$SAVE_KEY" diff --git a/packages/scummvm/files/makefile-nostrip.patch b/packages/scummvm/files/makefile-nostrip.patch new file mode 100644 index 0000000000..7f9c8b49d2 --- /dev/null +++ b/packages/scummvm/files/makefile-nostrip.patch @@ -0,0 +1,13 @@ +Index: scummvm-0.9.1/Makefile +=================================================================== +--- scummvm-0.9.1.orig/Makefile 2007-08-18 13:02:07.000000000 +0200 ++++ scummvm-0.9.1/Makefile 2007-08-18 13:02:24.000000000 +0200 +@@ -45,7 +45,7 @@ + + install: all + $(INSTALL) -d "$(DESTDIR)$(BINDIR)" +- $(INSTALL) -c -s -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" ++ $(INSTALL) -c -m 755 "$(srcdir)/scummvm$(EXEEXT)" "$(DESTDIR)$(BINDIR)/scummvm$(EXEEXT)" + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man6/" + $(INSTALL) -c -m 644 "$(srcdir)/dists/scummvm.6" "$(DESTDIR)$(MANDIR)/man6/scummvm.6" + $(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/" diff --git a/packages/scummvm/files/scummvm.desktop b/packages/scummvm/files/scummvm.desktop new file mode 100644 index 0000000000..96c025050e --- /dev/null +++ b/packages/scummvm/files/scummvm.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=ScummVM +Name[pl]=ScummVM +Comment=Interpreter for several adventure games +Comment[pl]=Interpreter graficznych gier przygodowych +Exec=openmoko-scummvm +Icon=scummvm.xpm +Terminal=false +Type=Application +Categories=Application;Game;AdventureGame; +StartupNotify=false diff --git a/packages/scummvm/scummvm.inc b/packages/scummvm/scummvm.inc index 5362a2884f..af38e5c305 100644 --- a/packages/scummvm/scummvm.inc +++ b/packages/scummvm/scummvm.inc @@ -1,4 +1,5 @@ -DESCRIPTION = "Virtual Machine for LucasArts Adventures" +DESCRIPTION = "Virtual Machine for several classic graphical point-and-click adventure games" +HOMEPAGE = "http://www.scummvm.org" SECTION = "games" PRIORITY = "optional" LICENSE = "GPL" diff --git a/packages/scummvm/scummvm_0.9.1.bb b/packages/scummvm/scummvm_0.9.1.bb index 5d1e2c1e27..41c7832acc 100644 --- a/packages/scummvm/scummvm_0.9.1.bb +++ b/packages/scummvm/scummvm_0.9.1.bb @@ -1,8 +1,12 @@ -DEFAULT_PREFERENCE = "-1" - require scummvm.inc DEPENDS = "virtual/libsdl libmad libvorbis libogg zlib mpeg2dec" +SRC_URI += "file://makefile-nostrip.patch;patch=1" +SRC_URI_append_openmoko = " file://openmoko-scummvm \ + file://scummvm.desktop" + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" + EXTRA_OECONF += "--enable-lure \ --enable-agi \ --enable-cine \ @@ -10,7 +14,20 @@ EXTRA_OECONF += "--enable-lure \ do_compile() { oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS} -lmpeg2" \ - DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2" + DEFINES="-DUNIX -DSCUMM_NEED_ALIGNMENT -DUSE_MAD -DUSE_VORBIS -DUSE_ZLIB -DUSE_MPEG2" } +do_install_append() { + if [ -f ${WORKDIR}/openmoko-scummvm ]; then + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/openmoko-scummvm ${D}${bindir}/openmoko-scummvm + fi + if [ -f ${WORKDIR}/scummvm.desktop ]; then + install -d ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/scummvm.desktop ${D}${datadir}/applications + fi + install -d ${D}${datadir}/scummvm + install -m 0644 gui/themes/modern.ini ${D}${datadir}/scummvm/ + install -m 0644 gui/themes/modern.zip ${D}${datadir}/scummvm/ +} diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb index fe8672381a..b50254c7dc 100644 --- a/packages/tasks/task-mokogateway.bb +++ b/packages/tasks/task-mokogateway.bb @@ -3,7 +3,7 @@ ALLOW_EMPTY = "1" PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-mokogateway-everything" -PR = "r3" +PR = "r4" PACKAGES = "\ task-mokogateway-everything \ @@ -74,7 +74,6 @@ RRECOMMENDS_task-mokogateway-wifi = "\ DESCRIPTION_task-mokogateway-debug = "MokoGateway: Debug" RDEPENDS_task-mokogateway-debug = "\ dfu-util \ - ftdi-eeprom \ openocd \ " RRECOMMENDS_task-mokogateway-debug = "\ diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index b45f3eeac6..968af909f3 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -16,7 +16,7 @@ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa" REPENDS="rgb" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.gz \ +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \ file://xorg.conf" S = "${WORKDIR}/${XORG_PN}-${PV}" diff --git a/packages/xorg-xserver/xserver-xorg-1.3.0.0/.mtn2git_empty b/packages/xorg-xserver/xserver-xorg-1.3.0.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg-1.3.0.0/.mtn2git_empty diff --git a/packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch b/packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch new file mode 100644 index 0000000000..96924484af --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch @@ -0,0 +1,11 @@ +--- xorg-server-1.3.0.0.orig/hw/xfree86/os-support/linux/Makefile.am ++++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/Makefile.am +@@ -38,7 +38,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(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_SOURCES = \ diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb index 78fdc01b46..b04ef19038 100644 --- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -2,6 +2,9 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" +PR = "r1" + +SRC_URI += "file://drmfix.patch;patch=1" EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " |