diff options
135 files changed, 841 insertions, 187 deletions
diff --git a/classes/xfce.bbclass b/classes/xfce.bbclass index ecc00825bc..c6ccc5fd2c 100644 --- a/classes/xfce.bbclass +++ b/classes/xfce.bbclass @@ -12,9 +12,15 @@ SRC_URI = "http://www.us.xfce.org/archive/xfce-${PV}/src/${PN}-${PV}.tar.bz2" inherit autotools +AUTOTOOLS_STAGE_PKGCONFIG = "1" + EXTRA_OECONF += "--with-pluginsdir=${libdir}/xfce4/panel-plugins/" # FIXME: Put icons in their own package too? FILES_${PN} += "${datadir}/icons/* ${datadir}/applications/* ${libdir}/xfce4/modules/*.so*" FILES_${PN}-doc += "${datadir}/xfce4/doc" + +FILES_${PN}-dev += "${libdir}/xfce4/*/*.la" +FILES_${PN}-dbg += "${libdir}/xfce4/*/.debug" + diff --git a/conf/bitbake.conf b/conf/bitbake.conf index ea9b290184..75eab15d9b 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -164,6 +164,14 @@ RPROVIDES = "" MULTI_PROVIDER_WHITELIST = "virtual/libintl" +SOLIBS = ".so.*" +SOLIBS_darwin = ".*.dylib" +SOLIBS_darwin8 = ".*.dylib" + +SOLIBSDEV = ".so" +SOLIBSDEV_darwin = ".dylib" +SOLIBSDEV_darwin8 = ".dylib" + PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" #enable this when bitbake is upgraded to cope with ++ values in the field #PACKAGES_DYNAMIC = "${PN}-locale-*" diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc index 17459ee31d..54f1c6667c 100644 --- a/conf/distro/include/angstrom-2008-preferred-versions.inc +++ b/conf/distro/include/angstrom-2008-preferred-versions.inc @@ -1,20 +1,24 @@ PREFERRED_VERSION_automake-native = "1.10" PREFERRED_VERSION_busybox = "1.9.2" -PREFERRED_VERSION_cairo = "1.6.4" +PREFERRED_VERSION_cairo = "1.7.6" PREFERRED_VERSION_dbus = "1.2.1" PREFERRED_VERSION_dropbear = "0.51" PREFERRED_VERSION_fontconfig = "2.4.1" PREFERRED_VERSION_glib-2.0 = "2.18.1" PREFERRED_VERSION_glib-2.0-native = "2.18.0" +PREFERRED_VERSION_glibmm = "2.18.0" +PREFERRED_VERSION_glproto = "1.4.9" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_gtk+ = "2.14.2" +PREFERRED_VERSION_gtkmm = "2.14.1" +PREFERRED_VERSION_inputproto = "1.4.4" PREFERRED_VERSION_libsdl-x11 = "1.2.11" PREFERRED_VERSION_libtool = "2.2.4" PREFERRED_VERSION_libtool-native = "2.2.4" PREFERRED_VERSION_libtool-cross = "2.2.4" PREFERRED_VERSION_libtool-sdk = "2.2.4" -PREFERRED_VERSION_pango = "1.20.5" -PREFERRED_VERSION_pixman = "0.11.8" +PREFERRED_VERSION_pango = "1.22.0" +PREFERRED_VERSION_pixman = "0.12.0" PREFERRED_VERSION_pkgconfig = "0.23" PREFERRED_VERSION_pkgconfig-native = "0.23" PREFERRED_VERSION_pulseaudio = "0.9.10" diff --git a/packages/accelges/accelges_svn.bb b/packages/accelges/accelges_svn.bb index 93895e5cbe..73c274a3d7 100644 --- a/packages/accelges/accelges_svn.bb +++ b/packages/accelges/accelges_svn.bb @@ -4,6 +4,7 @@ AUTHOR = "Paul V. Borza" LICENSE = "GPL" DEPENDS = "libnotify" PV = "0.2+svn${SRCREV}" +PR = "r1" SRC_URI = "svn://accelges.googlecode.com/svn/;module=trunk;proto=http" S = "${WORKDIR}/trunk" @@ -11,3 +12,5 @@ S = "${WORKDIR}/trunk" inherit autotools # FIXME increase packaging granularity +FILES_${PN} += "${datadir}" + diff --git a/packages/cairo/cairo_1.7.6.bb b/packages/cairo/cairo_1.7.6.bb new file mode 100644 index 0000000000..b90c2631d5 --- /dev/null +++ b/packages/cairo/cairo_1.7.6.bb @@ -0,0 +1,9 @@ +require cairo.inc + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "http://cairographics.org/snapshots/cairo-${PV}.tar.gz \ +# file://configure_fix.patch;patch=1 \ + " + + diff --git a/packages/classpath/classpath-tools-native.bb b/packages/classpath/classpath-tools-native.bb new file mode 100644 index 0000000000..df5df33407 --- /dev/null +++ b/packages/classpath/classpath-tools-native.bb @@ -0,0 +1,7 @@ +# Java recipes which need gjar, gjavah and so on need to depend on this +# recipe. +# This makes sure we not only have the tools' bytecode but also a proper +# interpreter that can run it. +DESCRIPTION = "Provides working jar, javah etc. from the GNU Classpath project" + +DEPENDS = "virtual/java-native classpath-native" diff --git a/packages/glibmm/glibmm_2.18.0.bb b/packages/glibmm/glibmm_2.18.0.bb new file mode 100644 index 0000000000..90a053fb36 --- /dev/null +++ b/packages/glibmm/glibmm_2.18.0.bb @@ -0,0 +1 @@ +require glibmm.inc diff --git a/packages/gnome/epiphany_2.24.0.bb b/packages/gnome/epiphany_2.24.0.bb new file mode 100644 index 0000000000..d2d45475b7 --- /dev/null +++ b/packages/gnome/epiphany_2.24.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "GNOME default webbrowser" +DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" +RDEPENDS = "gnome-vfs-plugin-http" + +inherit gnome + + +EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}" + +do_configure_prepend() { + touch ${S}/gnome-doc-utils.make + sed -i -e s:help::g Makefile.am +} + +FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" + + diff --git a/packages/gnome/gconf-editor_2.24.0.bb b/packages/gnome/gconf-editor_2.24.0.bb new file mode 100644 index 0000000000..88b515c7e9 --- /dev/null +++ b/packages/gnome/gconf-editor_2.24.0.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Editor for the gnome registry" +LICENSE = "GPLv2" +DEPENDS = "gnome-doc-utils gconf-dbus" + +inherit gnome gconf + +do_configure_prepend() { + sed -i -e s:docs::g ${S}/Makefile.am +} + +FILES_${PN} += "${datadir}/icons" diff --git a/packages/gnome/gnome-desktop_2.24.0.bb b/packages/gnome/gnome-desktop_2.24.0.bb new file mode 100644 index 0000000000..4460c5ad92 --- /dev/null +++ b/packages/gnome/gnome-desktop_2.24.0.bb @@ -0,0 +1,8 @@ +require gnome-desktop.inc + +inherit gnome pkgconfig + +DEPENDS += "gnome-doc-utils gnome-vfs" + +SRC_URI += "file://scrollkeeper.patch;patch=1 \ + file://no-desktop-docs.patch;patch=1;pnum=0" diff --git a/packages/gnome/gnome-icon-theme_2.24.0.bb b/packages/gnome/gnome-icon-theme_2.24.0.bb new file mode 100644 index 0000000000..d5e7f29b69 --- /dev/null +++ b/packages/gnome/gnome-icon-theme_2.24.0.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" +DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" +RDEPENDS = "hicolor-icon-theme" +RRECOMMENDS = "librsvg-gtk" + +FILES_${PN} += "${datadir}/*" + +EXTRA_OECONF = "--disable-hicolor-check" + +inherit gnome + +PACKAGE_ARCH = "all" diff --git a/packages/gnome/gnome-menus_2.24.0.bb b/packages/gnome/gnome-menus_2.24.0.bb new file mode 100644 index 0000000000..5837e7fed2 --- /dev/null +++ b/packages/gnome/gnome-menus_2.24.0.bb @@ -0,0 +1,15 @@ +DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+" +LICENSE = "GPL" + +inherit gnome pkgconfig + +do_stage() { +autotools_stage_all +} + +PACKAGES += "${PN}-python" +FILES_${PN} += "${datadir}/desktop-directories/" +FILES_${PN}-python = "${libdir}/python*" +FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug \ + ${libdir}/python*/site-packages/.debug" + diff --git a/packages/gnome/gnome-system-monitor_2.24.0.bb b/packages/gnome/gnome-system-monitor_2.24.0.bb new file mode 100644 index 0000000000..0e27be5ffe --- /dev/null +++ b/packages/gnome/gnome-system-monitor_2.24.0.bb @@ -0,0 +1,24 @@ +LICENSE = "GPLv2" +DEPENDS = "libgtop gtkmm glibmm libnotify libgnomeui gnome-panel gnome-doc-utils libwnck gtk+ gnome-keyring libglade hal dbus-glib " + +inherit gnome + +do_configure_prepend() { + sed -i -e s:help::g ${S}/Makefile.am +} + + +PACKAGES =+ "${PN}-applets" + +FILES_${PN}-applets = "${bindir}/*applet* \ + ${libdir}/bonobo/servers \ + ${datadir}/gnome-2.0/ui" + +FILES_${PN} += "${datadir}/icons \ + ${datadir}/dbus-1 \ + ${datadir}/gnome/autostart \ + " + +FILE_{PN}-doc += "${datadir}/omf \ + ${datadir}/gnome/help " + diff --git a/packages/gnome/gnome-themes_2.24.0.bb b/packages/gnome/gnome-themes_2.24.0.bb new file mode 100644 index 0000000000..1b45ab4d05 --- /dev/null +++ b/packages/gnome/gnome-themes_2.24.0.bb @@ -0,0 +1,31 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" +DEPENDS = "gtk-engines icon-naming-utils-native glib-2.0 intltool-native" +RDEPENDS = "gnome-icon-theme" + +EXTRA_OECONF = "--enable-all-themes --disable-hicolor-check" + +inherit gnome + +PACKAGE_ARCH = "all" + +PACKAGES =+ " gtk-engine-crux gtk-engine-hc gtk-engine-lighthouseblue gtk-engine-mist gtk-engine-thinice" +FILES_gtk-engine-crux = "${libdir}/gtk-2.0/*/engines/libcrux-engine.so" +FILES_gtk-engine-hc = "${libdir}/gtk-2.0/*/engines/libhcengine.so" +FILES_gtk-engine-lighthouseblue = "${libdir}/gtk-2.0/*/engines/liblighthouseblue.so" +FILES_gtk-engine-mist = "${libdir}/gtk-2.0/*/engines/libmist.so" +FILES_gtk-engine-thinice = "${libdir}/gtk-2.0/*/engines/libthinice.so" + +PACKAGES =+ " gnome-theme-crux gnome-theme-grand-canyon gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-lighthouseblue gnome-theme-mist gnome-theme-traditional" +FILES_gnome-theme-crux = "${datadir}/themes/Crux ${datadir}/icons/Crux" +FILES_gnome-theme-grand-canyon = "${datadir}/themes/Grand-Canyon ${datadir}/icons/Grand-Canyon" +FILES_gnome-theme-highcontrast = "${datadir}/themes/HighContrast ${datadir}/icons/HighContrast" +FILES_gnome-theme-highcontrastinverse = "${datadir}/themes/HighContrastInverse ${datadir}/icons/HighContrastInverse" +FILES_gnome-theme-highcontrastlargeprint = "${datadir}/themes/HighContrastLargePrint ${datadir}/icons/HighContrastLargePrint" +FILES_gnome-theme-highcontrastlargeprintinverse = "${datadir}/themes/HighContrastLargePrintInverse ${datadir}/icons/HighContrastLargePrintInverse" +FILES_gnome-theme-largeprint = "${datadir}/themes/LargePrint ${datadir}/icons/LargePrint" +FILES_gnome-theme-lighthouseblue = "${datadir}/themes/LighthouseBlue ${datadir}/icons/LighthouseBlue" +FILES_gnome-theme-mist = "${datadir}/themes/Mist ${datadir}/icons/Mist" +FILES_gnome-theme-traditional = "${datadir}/themes/Traditional ${datadir}/icons/Traditional" + +FILES_${PN} += "${datadir}/themes ${datadir}/icons" diff --git a/packages/gnome/libgnome_2.24.0.bb b/packages/gnome/libgnome_2.24.0.bb new file mode 100644 index 0000000000..549cda2855 --- /dev/null +++ b/packages/gnome/libgnome_2.24.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Gnome application programming libraries" +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +PR = "r0" + +inherit gnome lib_package + +DEPENDS = "gconf-native gnome-vfs libbonobo esound" + +EXTRA_OECONF = "--disable-gtk-doc" + +FILES_${PN} += "${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so \ + ${datadir}/gnome-background-properties ${datadir}/pixmaps" +FILES_${PN}-dev += "${libdir}/bonobo/monikers/*a" +FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/libgnomeprint_2.18.5.bb b/packages/gnome/libgnomeprint_2.18.5.bb new file mode 100644 index 0000000000..899ded9c6d --- /dev/null +++ b/packages/gnome/libgnomeprint_2.18.5.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" + +DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common" + +inherit flow-lossage pkgconfig gnome + +FILES_${PN}-dbg += "${libdir}/libgnomeprint/${PV}/modules/transports/.debug \ + ${libdir}/libgnomeprint/${PV}/modules/.debug ${libdir}/libgnomeprint/${PV}/modules/*/.debug" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/libgnomeprintui_2.18.3.bb b/packages/gnome/libgnomeprintui_2.18.3.bb new file mode 100644 index 0000000000..7c6d289e3a --- /dev/null +++ b/packages/gnome/libgnomeprintui_2.18.3.bb @@ -0,0 +1,11 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common" + +inherit gnome pkgconfig + +EXTRA_OECONF = "use_local_libgnomeprint_la=no" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/libgnomeui_2.24.0.bb b/packages/gnome/libgnomeui_2.24.0.bb new file mode 100644 index 0000000000..6cde2362d2 --- /dev/null +++ b/packages/gnome/libgnomeui_2.24.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "GNOME User Interface Library" +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring" + +inherit gnome + +FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \ + ${libdir}/libglade/*/lib*.so \ + ${datadir}/pixmaps/gnome-about-logo.png" +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/" + +SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_configure_prepend() { + install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/libgtop_2.24.0.bb b/packages/gnome/libgtop_2.24.0.bb new file mode 100644 index 0000000000..02d1d9405c --- /dev/null +++ b/packages/gnome/libgtop_2.24.0.bb @@ -0,0 +1,10 @@ +LICENSE = "LGPL" +DEPENDS = "glib-2.0" + +inherit gnome lib_package + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} diff --git a/packages/gnome/libwnck_2.24.0.bb b/packages/gnome/libwnck_2.24.0.bb new file mode 100644 index 0000000000..b176493b93 --- /dev/null +++ b/packages/gnome/libwnck_2.24.0.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Window navigation construction toolkit" +LICENSE = "LGPL" +SECTION = "x11/libs" +DEPENDS = "gtk+ gdk-pixbuf-csource-native" + +inherit gnome + +do_stage() { + autotools_stage_all +} diff --git a/packages/gtkmm/gtkmm_2.14.1.bb b/packages/gtkmm/gtkmm_2.14.1.bb new file mode 100644 index 0000000000..e3def49b5b --- /dev/null +++ b/packages/gtkmm/gtkmm_2.14.1.bb @@ -0,0 +1,11 @@ +require gtkmm.inc + +DEPENDS += "pangomm" + +PR = "r0" + +# Hack! Remove once gtkmm likes libtool 2x +do_cconfigure() { + gnu-configize + oe_runconf +} diff --git a/packages/icon-naming-utils/icon-naming-utils-native_0.8.7.bb b/packages/icon-naming-utils/icon-naming-utils-native_0.8.7.bb new file mode 100644 index 0000000000..e7ef65f342 --- /dev/null +++ b/packages/icon-naming-utils/icon-naming-utils-native_0.8.7.bb @@ -0,0 +1,8 @@ +LICENSE = "GPLv2" +DEPENDS = "libxml-simple-perl-native" + +SRC_URI = "http://tango.freedesktop.org/releases/icon-naming-utils-${PV}.tar.gz" + +S = "${WORKDIR}/icon-naming-utils-${PV}" + +inherit autotools native diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb index f741e20d45..d746f0d9d0 100644 --- a/packages/images/beagleboard-demo-image.bb +++ b/packages/images/beagleboard-demo-image.bb @@ -24,18 +24,21 @@ IMAGE_INSTALL = "\ gpe-scap \ psplash \ e-wm exhibit \ - xterm xmms epiphany-firefox-replacement \ + xterm xmms \ + epiphany firefox midori \ swfdec-mozilla \ hicolor-icon-theme gnome-icon-theme \ jaaa nmap iperf gnuplot \ abiword \ -# gnumeric \ -# gimp \ + gnumeric \ + gimp \ powertop oprofile \ pidgin \ # irssi \ mplayer omapfbplay \ gnome-games \ + rt73-firmware zd1211-firmware \ + stalonetray \ " IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp" diff --git a/packages/javasqlite/javasqlite_20080130.bb b/packages/javasqlite/javasqlite_20080130.bb index c6de994c67..3137fba4d4 100644 --- a/packages/javasqlite/javasqlite_20080130.bb +++ b/packages/javasqlite/javasqlite_20080130.bb @@ -8,7 +8,7 @@ SRC_URI = "\ http://www.ch-werner.de/javasqlite/javasqlite-${PV}.tar.gz \ file://build-fix.patch;patch=1" -DEPENDS = "virtual/javac-native fastjar-native classpath-native javasqlite-mkconst-native classpath sqlite sqlite3" +DEPENDS = "virtual/javac-native fastjar-native classpath-tools-native javasqlite-mkconst-native classpath sqlite sqlite3" RDEPENDS_${JPN} = "lib${PN}-jni" inherit java-library autotools diff --git a/packages/libmatthew/libmatthew.inc b/packages/libmatthew/libmatthew.inc index d7a483e25f..d68b78ad0d 100644 --- a/packages/libmatthew/libmatthew.inc +++ b/packages/libmatthew/libmatthew.inc @@ -3,7 +3,7 @@ AUTHOR = "Matthew Johnson <web@matthew.ath.cx>" HOMEPAGE = "http://www.matthew.ath.cx/projects/java" SECTION = "libs" LICENSE = "LGPL" -DEPENDS = "classpath-native classpath fastjar-native virtual/javac-native" +DEPENDS = "classpath-tools-native classpath" S = "${WORKDIR}/libmatthew-java-${PV}" diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 47c41f1425..c726740485 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-omap1 -# Sat Sep 20 15:44:20 2008 +# Thu Sep 25 07:42:19 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -80,9 +80,8 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_VM_EVENT_COUNTERS=y -CONFIG_SLUB_DEBUG=y -# CONFIG_SLAB is not set -CONFIG_SLUB=y +CONFIG_SLAB=y +# CONFIG_SLUB is not set # CONFIG_SLOB is not set CONFIG_PROFILING=y # CONFIG_MARKERS is not set @@ -719,9 +718,6 @@ CONFIG_B43=m CONFIG_B43_LEDS=y # CONFIG_B43_DEBUG is not set # CONFIG_B43LEGACY is not set -# CONFIG_B43LEGACY_DMA_AND_PIO_MODE is not set -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set CONFIG_ZD1211RW=m # CONFIG_ZD1211RW_DEBUG is not set CONFIG_RT2X00=m @@ -1881,8 +1877,7 @@ CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_RT_MUTEXES is not set # CONFIG_RT_MUTEX_TESTER is not set # CONFIG_DEBUG_SPINLOCK is not set diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index ded3a3bbe8..dcb8139486 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -6,7 +6,7 @@ SRCREV = "d6daf8d8cc5ccf90247def5551ee9c3e8555e848" PV = "2.6.26" #PV = "2.6.26+2.6.27-rc1+${PR}+git${SRCREV}" -PR = "r63" +PR = "r64" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" diff --git a/packages/mesa/mesa-common-old.inc b/packages/mesa/mesa-common-old.inc new file mode 100644 index 0000000000..18e9b4ebed --- /dev/null +++ b/packages/mesa/mesa-common-old.inc @@ -0,0 +1,9 @@ +SECTION = "x11" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ + file://mklib-rpath-link.patch;patch=1" +S = "${WORKDIR}/Mesa-${PV}" + +LICENSE = "LGPL" + +DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice" diff --git a/packages/mesa/mesa-common.inc b/packages/mesa/mesa-common.inc index 18e9b4ebed..ebfb920b87 100644 --- a/packages/mesa/mesa-common.inc +++ b/packages/mesa/mesa-common.inc @@ -1,9 +1,24 @@ SECTION = "x11" +DESCRIPTION = "An open source implementation of the OpenGL spec" +HOMEPAGE = "http://mesa3d.org" +LICENSE = "MIT" + SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ - file://mklib-rpath-link.patch;patch=1" + ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 " S = "${WORKDIR}/Mesa-${PV}" -LICENSE = "LGPL" +PROVIDES = "virtual/libgl" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-glu \ + --disable-glw \ + --disable-glut \ + --enable-glx-tls" + +do_stage() { + autotools_stage_all +} + -DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice" diff --git a/packages/mesa/mesa-dri_6.5.2.bb b/packages/mesa/mesa-dri_6.5.2.bb index c39a3eb5b9..f94ea8b3d2 100644 --- a/packages/mesa/mesa-dri_6.5.2.bb +++ b/packages/mesa/mesa-dri_6.5.2.bb @@ -1,4 +1,4 @@ -include mesa-common.inc +include mesa-common-old.inc SRC_URI += " file://mklib-cross.patch;patch=1" diff --git a/packages/mesa/mesa-dri_7.0.3.bb b/packages/mesa/mesa-dri_7.0.3.bb index 7617b87cd7..330efb23af 100644 --- a/packages/mesa/mesa-dri_7.0.3.bb +++ b/packages/mesa/mesa-dri_7.0.3.bb @@ -1,4 +1,4 @@ -include mesa-common.inc +include mesa-common-old.inc # suppress mklib-rpath-link patch from mesa-common SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 file://mklib-cross.patch;patch=1" diff --git a/packages/mesa/mesa-dri_7.2.bb b/packages/mesa/mesa-dri_7.2.bb new file mode 100644 index 0000000000..8dfc7f83d3 --- /dev/null +++ b/packages/mesa/mesa-dri_7.2.bb @@ -0,0 +1,28 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto dri2proto" +LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +PE = "1" +PR = "r3" + +# most of our targets do not have DRI so will use mesa-xlib +DEFAULT_PREFERENCE = "-1" + +# ASUS EeePC 901 has DRI support so use mesa-dri by default +DEFAULT_PREFERENCE_eee901 = "1" + +PACKAGES =+ "${PN}-xprogs" + +FILES_${PN} += "${libdir}/dri/*.so" +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" +FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" + +EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}" + +do_install_append () { + install -d ${D}/usr/bin + install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/ +} diff --git a/packages/mesa/mesa-dri_git.bb b/packages/mesa/mesa-dri_git.bb new file mode 100644 index 0000000000..d9e61d8a5c --- /dev/null +++ b/packages/mesa/mesa-dri_git.bb @@ -0,0 +1,20 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto dri2proto" +LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +PV = "7.2+git${SRCREV}" +PR = "r1" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git" +S = "${WORKDIR}/git" + +FILES_${PN} += "${libdir}/dri/*.so" +FILES_${PN}-dbg += "${libdir}/dri/.debug/*" + +EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=${MACHINE_DRI_MODULES}" + diff --git a/packages/mesa/mesa-mesa.inc b/packages/mesa/mesa-mesa.inc index d794f0c097..48d171d50d 100644 --- a/packages/mesa/mesa-mesa.inc +++ b/packages/mesa/mesa-mesa.inc @@ -1,4 +1,4 @@ -include mesa-common.inc +include mesa-common-old.inc PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev" diff --git a/packages/mesa/mesa-xlib_7.2.bb b/packages/mesa/mesa-xlib_7.2.bb new file mode 100644 index 0000000000..069446904c --- /dev/null +++ b/packages/mesa/mesa-xlib_7.2.bb @@ -0,0 +1,20 @@ +include mesa-common.inc + +PROTO_DEPS = "xf86driproto glproto" +LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes" + +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" + +PE = "1" +PR = "r3" + +EXTRA_OECONF += "--with-driver=xlib" + +PACKAGES =+ "${PN}-xprogs" + +FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo" + +do_install_append () { + install -d ${D}/${bindir} + install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir} +} diff --git a/packages/mesa/mesa_7.2.bb b/packages/mesa/mesa_7.2.bb new file mode 100644 index 0000000000..5f8c4bc892 --- /dev/null +++ b/packages/mesa/mesa_7.2.bb @@ -0,0 +1,2 @@ +# This is a dummy package so OE can use the poky mesa files +require mesa-xlib_${PV}.bb diff --git a/packages/midpath/midpath-common.inc b/packages/midpath/midpath-common.inc index 1690b4fc44..0c320e4408 100644 --- a/packages/midpath/midpath-common.inc +++ b/packages/midpath/midpath-common.inc @@ -5,7 +5,7 @@ LICENSE = "GPL" PRIORITY = "optional" SECTION = "interpreters" -DEPENDS = "virtual/javac-native classpath-native classpath fastjar-native" +DEPENDS = "virtual/javac-native classpath-tools-native classpath fastjar-native" GLIBJ_ZIP = "${STAGING_DATADIR}/classpath/glibj.zip" diff --git a/packages/pango/pango-1.22.0/.mtn2git_empty b/packages/pango/pango-1.22.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pango/pango-1.22.0/.mtn2git_empty diff --git a/packages/pango/pango-1.22.0/no-tests.patch b/packages/pango/pango-1.22.0/no-tests.patch new file mode 100644 index 0000000000..dafcb20c3b --- /dev/null +++ b/packages/pango/pango-1.22.0/no-tests.patch @@ -0,0 +1,10 @@ +--- /tmp/Makefile.am 2007-03-01 13:29:37.000000000 +0100 ++++ pango-1.16.0/Makefile.am 2007-03-01 13:29:52.545251000 +0100 +@@ -1,6 +1,6 @@ + ## Process this file with automake to create Makefile.in. + +-SUBDIRS= pango modules pango-view examples docs tools tests ++SUBDIRS= pango modules pango-view examples docs tools + + EXTRA_DIST = \ + autogen.sh \ diff --git a/packages/pango/pango_1.22.0.bb b/packages/pango/pango_1.22.0.bb new file mode 100644 index 0000000000..639e094cc0 --- /dev/null +++ b/packages/pango/pango_1.22.0.bb @@ -0,0 +1,4 @@ +require pango.inc +PR = "r2" + + diff --git a/packages/pango/pangomm_2.14.0.bb b/packages/pango/pangomm_2.14.0.bb new file mode 100644 index 0000000000..19d269d684 --- /dev/null +++ b/packages/pango/pangomm_2.14.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "C++ bindings for the pango library." +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "LGPL" +DEPENDS = "cairomm glibmm" +SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" + +SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.bz2" + +inherit autotools flow-lossage + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/*/include/" + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage () { + autotools_stage_all +} diff --git a/packages/phoneme/phoneme-advanced.inc b/packages/phoneme/phoneme-advanced.inc index a6b2951517..b5be402ac7 100644 --- a/packages/phoneme/phoneme-advanced.inc +++ b/packages/phoneme/phoneme-advanced.inc @@ -3,7 +3,7 @@ LICENSE = "GPLv2" HOMEPAGE = "https://phoneme.dev.java.net" AUTHOR = "Sun Microsystems, Inc." -DEPENDS = "classpath-native virtual/javac-native linux-libc-headers" +DEPENDS = "classpath-tools-native virtual/javac-native linux-libc-headers" inherit java update-alternatives diff --git a/packages/rxtx/rxtx_2.1-7r2.bb b/packages/rxtx/rxtx_2.1-7r2.bb index 0630d498d6..9b4f9fa4fa 100644 --- a/packages/rxtx/rxtx_2.1-7r2.bb +++ b/packages/rxtx/rxtx_2.1-7r2.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://rxtx.org" PR = "r1" -DEPENDS = "classpath classpath-native virtual/javac-native" +DEPENDS = "classpath classpath-tools-native" inherit autotools java-library diff --git a/packages/sqlitejdbc/sqlitejdbc_041.bb b/packages/sqlitejdbc/sqlitejdbc_041.bb index c2ab0f9b23..ef3fee36fd 100644 --- a/packages/sqlitejdbc/sqlitejdbc_041.bb +++ b/packages/sqlitejdbc/sqlitejdbc_041.bb @@ -12,7 +12,7 @@ S = "${WORKDIR}/${PN}-v${PV}" inherit java-library -DEPENDS = "classpath-native fastjar-native sqlite3 classpath" +DEPENDS = "classpath-tools-native sqlite3 classpath" RDEPENDS_${JPN} = "libsqlitejdbc-jni" do_unpackpost() { diff --git a/packages/stalonetray/.mtn2git_empty b/packages/stalonetray/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/stalonetray/.mtn2git_empty diff --git a/packages/stalonetray/stalonetray_0.7.6.bb b/packages/stalonetray/stalonetray_0.7.6.bb new file mode 100644 index 0000000000..83f812dfec --- /dev/null +++ b/packages/stalonetray/stalonetray_0.7.6.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Stalonetray is a stand-alone freedesktop.org and KDE system tray" +LICENSE = "GPLv2" +DEPENDS = "virtual/libx11" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2" + +inherit autotools + diff --git a/packages/swt/swt-gtk.inc b/packages/swt/swt-gtk.inc index 56e77faefa..0bdaaab932 100644 --- a/packages/swt/swt-gtk.inc +++ b/packages/swt/swt-gtk.inc @@ -3,7 +3,7 @@ LICENSE = "CPL MPL LGPL" inherit java-library -DEPENDS = "classpath-native cairo gtk+ atk libxtst" +DEPENDS = "classpath-tools-native cairo gtk+ atk libxtst" S = "${WORKDIR}/swt-source" diff --git a/packages/xfce/exo_0.3.2.bb b/packages/xfce/exo_0.3.2.bb index 6bf0e1292f..b48eeba645 100644 --- a/packages/xfce/exo_0.3.2.bb +++ b/packages/xfce/exo_0.3.2.bb @@ -1,7 +1,7 @@ DEPENDS = "libxfce4util xfce-mcs-manager hal liburi-perl-native python-native" -inherit pkgconfig xfce +inherit xfce SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.1/src/exo-0.3.2.tar.bz2" diff --git a/packages/xfce/libxfce4mcs.inc b/packages/xfce/libxfce4mcs.inc index 19268fc9b3..6ecbc8db58 100644 --- a/packages/xfce/libxfce4mcs.inc +++ b/packages/xfce/libxfce4mcs.inc @@ -1,12 +1,12 @@ # libxfce4mcs OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="Settings management library used by most XFce 4 modules" DEPENDS="libxfce4util" SECTION = "x11/libs" -inherit xfce pkgconfig +inherit xfce do_stage() { install -d ${STAGING_INCDIR}/xfce4/libxfce4mcs diff --git a/packages/xfce/libxfce4mcs_4.4.1.bb b/packages/xfce/libxfce4mcs_4.4.1.bb index 07d7a95ae1..8e2d522962 100644 --- a/packages/xfce/libxfce4mcs_4.4.1.bb +++ b/packages/xfce/libxfce4mcs_4.4.1.bb @@ -1,5 +1,5 @@ # libxfce4mcs OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/libxfce4util.inc b/packages/xfce/libxfce4util.inc index d5dd6d6565..ee7b886f20 100644 --- a/packages/xfce/libxfce4util.inc +++ b/packages/xfce/libxfce4util.inc @@ -1,13 +1,13 @@ # libxfce4util OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION = "Basic utility library for Xfce4" SECTION = "x11/libs" LICENSE = "GPL" DEPENDS = "glib-2.0 xfce4-dev-tools" -inherit xfce pkgconfig +inherit xfce MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" diff --git a/packages/xfce/libxfce4util_4.4.1.bb b/packages/xfce/libxfce4util_4.4.1.bb index 70f5ddac93..a53a83e861 100644 --- a/packages/xfce/libxfce4util_4.4.1.bb +++ b/packages/xfce/libxfce4util_4.4.1.bb @@ -1,5 +1,5 @@ # libxfce4util OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/libxfcegui4.inc b/packages/xfce/libxfcegui4.inc index 714e365af4..1b7703abf9 100644 --- a/packages/xfce/libxfcegui4.inc +++ b/packages/xfce/libxfcegui4.inc @@ -1,12 +1,12 @@ # libxfcegui4 OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION = "XFCE Widget library and X Window System interaction" DEPENDS = "libxfce4util dbh libxml2 gtk+" SECTION = "x11/libs" -inherit xfce pkgconfig +inherit xfce do_stage() { diff --git a/packages/xfce/libxfcegui4_4.4.1.bb b/packages/xfce/libxfcegui4_4.4.1.bb index 2def53685a..a36897f822 100644 --- a/packages/xfce/libxfcegui4_4.4.1.bb +++ b/packages/xfce/libxfcegui4_4.4.1.bb @@ -1,5 +1,5 @@ # libxfcegui4 OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/xfce-mcs-manager.inc b/packages/xfce/xfce-mcs-manager.inc index d90e82081e..7a421a4086 100644 --- a/packages/xfce/xfce-mcs-manager.inc +++ b/packages/xfce/xfce-mcs-manager.inc @@ -1,25 +1,16 @@ # xfce-mcs-manager OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE4 Settings manager." DEPENDS="libxfcegui4 libxfce4mcs intltool-native" SECTION = "x11" -PR = "r1" +PR = "r2" inherit xfce do_stage() { - install -d ${STAGING_INCDIR}/xfce4 - install -d ${STAGING_INCDIR}/xfce4/xfce-mcs-manager - install -m 644 xfce-mcs-manager/manager-plugin.h ${STAGING_INCDIR}/xfce4/xfce-mcs-manager + autotools_stage_all } -# xfce-mcs-manager.pc uses ${libdir} to indicate where the mcs plugins live -# the standard pkgconfig mangling was confusing us. Mangling is not required -# for this particular .pc, so the following will suffice: -do_stage_append () { - install -d ${PKG_CONFIG_DIR} - sed -e 's:${includedir}:${STAGING_INCDIR}:;' ${S}/xfce-mcs-manager/xfce-mcs-manager.pc >${PKG_CONFIG_DIR}/xfce-mcs-manager.pc -} diff --git a/packages/xfce/xfce-mcs-manager_4.4.1.bb b/packages/xfce/xfce-mcs-manager_4.4.1.bb index de5cf2b012..76e0452ad8 100644 --- a/packages/xfce/xfce-mcs-manager_4.4.1.bb +++ b/packages/xfce/xfce-mcs-manager_4.4.1.bb @@ -1,5 +1,5 @@ # xfce-mcs-manager OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/xfce-mcs-plugins.inc b/packages/xfce/xfce-mcs-plugins.inc index b5b4505e98..80037841fa 100644 --- a/packages/xfce/xfce-mcs-plugins.inc +++ b/packages/xfce/xfce-mcs-plugins.inc @@ -1,6 +1,6 @@ # xfce-mcs-plugins OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION = "Common XFCE4 configuration plugins." DEPENDS = "libxfcegui4 xfce-mcs-manager gtk+" diff --git a/packages/xfce/xfce-mcs-plugins_4.4.1.bb b/packages/xfce/xfce-mcs-plugins_4.4.1.bb index 02ad97e860..bd41458757 100644 --- a/packages/xfce/xfce-mcs-plugins_4.4.1.bb +++ b/packages/xfce/xfce-mcs-plugins_4.4.1.bb @@ -1,5 +1,5 @@ # xfce-mcs-plugins OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/xfce-utils.inc b/packages/xfce/xfce-utils.inc index 0b191194d7..d681fd7adb 100644 --- a/packages/xfce/xfce-utils.inc +++ b/packages/xfce/xfce-utils.inc @@ -1,6 +1,6 @@ # xfce-utils OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE4 Utilities" DEPENDS = "virtual/libx11 libxfcegui4 xfce-mcs-manager" diff --git a/packages/xfce/xfce-utils_4.4.1.bb b/packages/xfce/xfce-utils_4.4.1.bb index 57909f2c2d..fd41a609c2 100644 --- a/packages/xfce/xfce-utils_4.4.1.bb +++ b/packages/xfce/xfce-utils_4.4.1.bb @@ -1,6 +1,6 @@ # xfce-utils OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) PR = "r1" require ${PN}.inc diff --git a/packages/xfce/xfce4-appfinder.inc b/packages/xfce/xfce4-appfinder.inc index 0d102f3bd0..ddfa3e1e4e 100644 --- a/packages/xfce/xfce4-appfinder.inc +++ b/packages/xfce/xfce4-appfinder.inc @@ -1,6 +1,6 @@ # xfce4-appfinder build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE Application Finder" SECTION = "x11" diff --git a/packages/xfce/xfce4-appfinder_4.4.1.bb b/packages/xfce/xfce4-appfinder_4.4.1.bb index f7c97970d5..471122ea02 100644 --- a/packages/xfce/xfce4-appfinder_4.4.1.bb +++ b/packages/xfce/xfce4-appfinder_4.4.1.bb @@ -1,5 +1,5 @@ # xfce4-appfinder build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/xfce4-dev-tools.inc b/packages/xfce/xfce4-dev-tools.inc index 03f64e39e5..2116b1d414 100644 --- a/packages/xfce/xfce4-dev-tools.inc +++ b/packages/xfce/xfce4-dev-tools.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Xfce4 development tools" SECTION = "x11/libs" LICENSE = "GPL" -inherit xfce pkgconfig +inherit xfce do_stage() { install -d ${STAGING_DATADIR}/aclocal diff --git a/packages/xfce/xfce4-mixer.inc b/packages/xfce/xfce4-mixer.inc index a923489f32..4d3faed14c 100644 --- a/packages/xfce/xfce4-mixer.inc +++ b/packages/xfce/xfce4-mixer.inc @@ -1,6 +1,6 @@ # xfce-mixer-plugin OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE panel mixer plugin" SECTION = "x11" diff --git a/packages/xfce/xfce4-mixer_4.4.1.bb b/packages/xfce/xfce4-mixer_4.4.1.bb index 6dd3c0565b..13ba0f32e3 100644 --- a/packages/xfce/xfce4-mixer_4.4.1.bb +++ b/packages/xfce/xfce4-mixer_4.4.1.bb @@ -1,5 +1,5 @@ # xfce-mixer-plugin OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/xfce4-panel.inc b/packages/xfce/xfce4-panel.inc index 6ad71fcf82..be7092ab9e 100644 --- a/packages/xfce/xfce4-panel.inc +++ b/packages/xfce/xfce4-panel.inc @@ -1,12 +1,12 @@ # xfce4-panel OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION = "XFCE4 Panel" SECTION = "x11" DEPENDS = "startup-notification virtual/libx11 libxfcegui4 libxfce4mcs xfce-mcs-manager libxml2" -inherit pkgconfig xfce +inherit xfce EXTRA_OECONF += " --enable-startup-notification" diff --git a/packages/xfce/xfce4-panel_4.4.1.bb b/packages/xfce/xfce4-panel_4.4.1.bb index ae2abba28d..99194027c8 100644 --- a/packages/xfce/xfce4-panel_4.4.1.bb +++ b/packages/xfce/xfce4-panel_4.4.1.bb @@ -1,6 +1,6 @@ # xfce4-panel OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) PR="r2" require ${PN}.inc diff --git a/packages/xfce/xfdesktop.inc b/packages/xfce/xfdesktop.inc index bd5bb7223c..35c5ff5954 100644 --- a/packages/xfce/xfdesktop.inc +++ b/packages/xfce/xfdesktop.inc @@ -1,6 +1,6 @@ # xfdesktop OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="xfce4 Desktop Background Manager" SECTION = "x11/base" diff --git a/packages/xfce/xfdesktop_4.4.1.bb b/packages/xfce/xfdesktop_4.4.1.bb index 9c84150180..fcc2f89991 100644 --- a/packages/xfce/xfdesktop_4.4.1.bb +++ b/packages/xfce/xfdesktop_4.4.1.bb @@ -1,6 +1,6 @@ # xfdesktop OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) PR = "r2" require ${PN}.inc diff --git a/packages/xfce/xfprint_4.4.1.bb b/packages/xfce/xfprint_4.4.1.bb index 7e349ce881..19bfa0dde3 100644 --- a/packages/xfce/xfprint_4.4.1.bb +++ b/packages/xfce/xfprint_4.4.1.bb @@ -1,6 +1,6 @@ # xfprint OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE4 Print Manager" SECTION = "x11/base" diff --git a/packages/xfce/xfwm4-themes.inc b/packages/xfce/xfwm4-themes.inc index c60edc5b83..63c5ab0296 100644 --- a/packages/xfce/xfwm4-themes.inc +++ b/packages/xfce/xfwm4-themes.inc @@ -1,6 +1,6 @@ # xfwm4-themes OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE4 Window Manager Themes" SECTION = "x11/wm" diff --git a/packages/xfce/xfwm4-themes_4.4.1.bb b/packages/xfce/xfwm4-themes_4.4.1.bb index 9f67ad2ed9..c7f45d2b09 100644 --- a/packages/xfce/xfwm4-themes_4.4.1.bb +++ b/packages/xfce/xfwm4-themes_4.4.1.bb @@ -1,5 +1,5 @@ # xfwm4-themes OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) require ${PN}.inc diff --git a/packages/xfce/xfwm4.inc b/packages/xfce/xfwm4.inc index e443a841ae..211853aa18 100644 --- a/packages/xfce/xfwm4.inc +++ b/packages/xfce/xfwm4.inc @@ -1,6 +1,6 @@ # xfwm4 OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) DESCRIPTION="XFCE4 Window Manager" SECTION = "x11/wm" diff --git a/packages/xfce/xfwm4_4.4.1.bb b/packages/xfce/xfwm4_4.4.1.bb index 2fc47e641e..a2bdf3557e 100644 --- a/packages/xfce/xfwm4_4.4.1.bb +++ b/packages/xfce/xfwm4_4.4.1.bb @@ -1,6 +1,6 @@ # xfwm4 OE build file # Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) +# Released under the MIT license (see COPYING.MIT) PR="r1" require ${PN}.inc diff --git a/packages/xorg-lib/libice_1.0.4.bb b/packages/xorg-lib/libice_1.0.4.bb index 99f5dfa750..e4a6557397 100644 --- a/packages/xorg-lib/libice_1.0.4.bb +++ b/packages/xorg-lib/libice_1.0.4.bb @@ -3,7 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Inter-Client Exchange library" DEPENDS += "xproto xtrans" PROVIDES = "ice" -PR = "r0" +PR = "r1" PE = "1" XORG_PN = "libICE" diff --git a/packages/xorg-lib/libpciaccess/.mtn2git_empty b/packages/xorg-lib/libpciaccess/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-lib/libpciaccess/.mtn2git_empty diff --git a/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch b/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch new file mode 100644 index 0000000000..e2d9f62318 --- /dev/null +++ b/packages/xorg-lib/libpciaccess/fix-mtrr-check.patch @@ -0,0 +1,19 @@ +--- + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +--- libpciaccess-0.10.3.orig/configure.ac ++++ libpciaccess-0.10.3/configure.ac +@@ -89,12 +89,10 @@ esac + AM_CONDITIONAL(LINUX, [test "x$linux" = xyes]) + AM_CONDITIONAL(FREEBSD, [test "x$freebsd" = xyes]) + AM_CONDITIONAL(OPENBSD, [test "x$openbsd" = xyes]) + AM_CONDITIONAL(SOLARIS, [test "x$solaris" = xyes]) + +-AC_CHECK_FILE([/usr/include/asm/mtrr.h], +- [have_mtrr_h="yes"], [have_mtrr_h="no"]) + if test "x$have_mtrr_h" = xyes; then + AC_DEFINE(HAVE_MTRR, 1, [Use MTRRs on mappings]) + fi + + AC_SUBST(PCIACCESS_CFLAGS) diff --git a/packages/xorg-lib/libpciaccess_0.10.3.bb b/packages/xorg-lib/libpciaccess_0.10.3.bb new file mode 100644 index 0000000000..82ff529166 --- /dev/null +++ b/packages/xorg-lib/libpciaccess_0.10.3.bb @@ -0,0 +1,5 @@ +require xorg-lib-common.inc + +DEPENDS += "xproto virtual/libx11" + +SRC_URI += "file://fix-mtrr-check.patch;patch=1" diff --git a/packages/xorg-lib/libx11-sdk_1.1.4.bb b/packages/xorg-lib/libx11-sdk_1.1.4.bb new file mode 100644 index 0000000000..6140d13701 --- /dev/null +++ b/packages/xorg-lib/libx11-sdk_1.1.4.bb @@ -0,0 +1,8 @@ +require libx11_${PV}.bb + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +DEPENDS = "xproto-sdk xextproto-sdk libxau-sdk xtrans-sdk libxdmcp-sdk xcmiscproto-sdk xf86bigfontproto-sdk kbproto-sdk inputproto-sdk bigreqsproto-sdk util-macros-sdk xproto-native" +PROVIDES = "" + +inherit sdk diff --git a/packages/xorg-lib/libx11-trim/.mtn2git_empty b/packages/xorg-lib/libx11-trim/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-lib/libx11-trim/.mtn2git_empty diff --git a/packages/xorg-lib/libx11-trim/include_fix.patch b/packages/xorg-lib/libx11-trim/include_fix.patch new file mode 100644 index 0000000000..99ed57194e --- /dev/null +++ b/packages/xorg-lib/libx11-trim/include_fix.patch @@ -0,0 +1,23 @@ +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- libX11-1.1.5.orig/configure.ac ++++ libX11-1.1.5/configure.ac +@@ -218,13 +218,13 @@ AC_SUBST(XDMCP_LIBS) + AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) + + # + # Find keysymdef.h + # +-AC_MSG_CHECKING([keysymdef.h]) +-dir=`pkg-config --variable=includedir xproto` +-KEYSYMDEF="$dir/X11/keysymdef.h" ++AC_ARG_WITH(keysymdef, ++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), ++ KEYSYMDEF=$withval, KEYSYMDEF="") + if test -f "$KEYSYMDEF"; then + AC_MSG_RESULT([$KEYSYMDEF]) + else + AC_MSG_ERROR([Cannot find keysymdef.h]) + fi diff --git a/packages/xorg-lib/libx11-trim_1.1.5.bb b/packages/xorg-lib/libx11-trim_1.1.5.bb new file mode 100644 index 0000000000..e99b2a07b0 --- /dev/null +++ b/packages/xorg-lib/libx11-trim_1.1.5.bb @@ -0,0 +1,33 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 protocol and utility library" +DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto" + +#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" +#SRC_URI += "file://X18NCMSstubs.diff;patch=1 " + +PROVIDES = "virtual/libx11" + +PE = "1" +PR = "r1" + +XORG_PN = "libX11" +LEAD_SONAME = "libX11.so" + +SRC_URI += "file://include_fix.patch;patch=1" + +EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" +#EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb" +EXTRA_OECONF += "--disable-xcms --with-xcb" + +do_compile() { + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + cd ../../ + ) || exit 1 + oe_runmake +} + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB " + diff --git a/packages/xorg-lib/libx11_1.1.4.bb b/packages/xorg-lib/libx11_1.1.4.bb index 88771558f8..7ab3a7bb94 100644 --- a/packages/xorg-lib/libx11_1.1.4.bb +++ b/packages/xorg-lib/libx11_1.1.4.bb @@ -2,7 +2,7 @@ require xorg-lib-common.inc DESCRIPTION = "Base X libs." DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto" + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" PROVIDES = "virtual/libx11" PE = "1" PR = "r3" @@ -17,7 +17,9 @@ EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef. do_compile() { ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + cd src/util; + mv makekeys.c.orig makekeys.c || true + touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys # mv to stop it getting rebuilt mv makekeys.c makekeys.c.orig cd ../../ diff --git a/packages/xorg-lib/libx11_git.bb b/packages/xorg-lib/libx11_git.bb index 422afc92e0..f2929624e8 100644 --- a/packages/xorg-lib/libx11_git.bb +++ b/packages/xorg-lib/libx11_git.bb @@ -5,7 +5,8 @@ SECTION = "x11/libs" LICENSE = "XFree86" DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" PROVIDES = "virtual/libx11" -PR = "r3" +RPROVIDES = "virtual/libx11" +PR = "r1" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" FILES_${PN}-locale += "${datadir}/X11/locale" @@ -17,17 +18,14 @@ inherit autotools pkgconfig EXTRA_OECONF="--enable-malloc0returnsnull" - do_compile() { - ( - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys - cd ../../ - ) || exit 1 - oe_runmake + ( + unset CC LD CXX CCLD + oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + ) + oe_runmake } - do_stage() { autotools_stage_all } diff --git a/packages/xorg-lib/libxau-sdk_1.0.3.bb b/packages/xorg-lib/libxau-sdk_1.0.3.bb new file mode 100644 index 0000000000..64373f45a9 --- /dev/null +++ b/packages/xorg-lib/libxau-sdk_1.0.3.bb @@ -0,0 +1,6 @@ +require libxau_${PV}.bb + +DEPENDS = "xproto-sdk util-macros-sdk" +PROVIDES = "" + +inherit sdk diff --git a/packages/xorg-lib/libxau_1.0.4.bb b/packages/xorg-lib/libxau_1.0.4.bb new file mode 100644 index 0000000000..3a77534cff --- /dev/null +++ b/packages/xorg-lib/libxau_1.0.4.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "A Sample Authorization Protocol for X" +DEPENDS += " xproto" +PROVIDES = "xau" +PE = "1" + +XORG_PN = "libXau" diff --git a/packages/xorg-lib/libxaw_1.0.4.bb b/packages/xorg-lib/libxaw_1.0.4.bb index ebfb73b34a..f45431e79e 100644 --- a/packages/xorg-lib/libxaw_1.0.4.bb +++ b/packages/xorg-lib/libxaw_1.0.4.bb @@ -3,7 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X Athena Widget Set" DEPENDS += "xproto virtual/libx11 libxext xextproto libxt libxmu libxpm libxp printproto libxau" PROVIDES = "xaw" -PR = "r0" +PR = "r1" PE = "1" XORG_PN = "libXaw" diff --git a/packages/xorg-lib/libxcomposite_0.4.0.bb b/packages/xorg-lib/libxcomposite_0.4.0.bb index 8921b927bf..b3b9d49d63 100644 --- a/packages/xorg-lib/libxcomposite_0.4.0.bb +++ b/packages/xorg-lib/libxcomposite_0.4.0.bb @@ -2,7 +2,7 @@ require xorg-lib-common.inc DESCRIPTION = "X Composite extension library." LICENSE= "BSD-X" -DEPENDS += " compositeproto virtual/libx11 libxfixes" +DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" PROVIDES = "xcomposite" PE = "1" diff --git a/packages/xorg-lib/libxcursor_1.1.9.bb b/packages/xorg-lib/libxcursor_1.1.9.bb index 620ab4a39b..4713eccc48 100644 --- a/packages/xorg-lib/libxcursor_1.1.9.bb +++ b/packages/xorg-lib/libxcursor_1.1.9.bb @@ -3,6 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X cursor management library" LICENSE= "BSD-X" DEPENDS += "libxrender libxfixes" +PR = "r2" PE = "1" XORG_PN = "libXcursor" diff --git a/packages/xorg-lib/libxdmcp-native_1.0.2.bb b/packages/xorg-lib/libxdmcp-native_1.0.2.bb index d57f8ac48e..873e9397d7 100644 --- a/packages/xorg-lib/libxdmcp-native_1.0.2.bb +++ b/packages/xorg-lib/libxdmcp-native_1.0.2.bb @@ -5,5 +5,6 @@ PR = "r1" PE = "1" XORG_PN = "libXdmcp" +PROVIDES = "" inherit native diff --git a/packages/xorg-lib/libxdmcp-sdk_1.0.2.bb b/packages/xorg-lib/libxdmcp-sdk_1.0.2.bb new file mode 100644 index 0000000000..d58bb07a8c --- /dev/null +++ b/packages/xorg-lib/libxdmcp-sdk_1.0.2.bb @@ -0,0 +1,6 @@ +require libxdmcp_${PV}.bb + +DEPENDS = "xproto-sdk util-macros-sdk" +PROVIDES = "" + +inherit sdk diff --git a/packages/xorg-lib/libxext-sdk_1.0.4.bb b/packages/xorg-lib/libxext-sdk_1.0.4.bb new file mode 100644 index 0000000000..267faa584e --- /dev/null +++ b/packages/xorg-lib/libxext-sdk_1.0.4.bb @@ -0,0 +1,6 @@ +require libxext_${PV}.bb + +DEPENDS = "xproto-sdk util-macros-sdk libx11-sdk libxau-sdk xextproto-sdk" +PROVIDES = "" + +inherit sdk diff --git a/packages/xorg-lib/libxext_1.0.4.bb b/packages/xorg-lib/libxext_1.0.4.bb index 3e8aa50f7c..81231a866c 100644 --- a/packages/xorg-lib/libxext_1.0.4.bb +++ b/packages/xorg-lib/libxext_1.0.4.bb @@ -3,6 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 miscellaneous extension library" DEPENDS += "xproto virtual/libx11 xextproto libxau" PROVIDES = "xext" +PR = "r1" PE = "1" XORG_PN = "libXext" diff --git a/packages/xorg-lib/libxfont_1.3.3.bb b/packages/xorg-lib/libxfont_1.3.3.bb new file mode 100644 index 0000000000..a5afe7e956 --- /dev/null +++ b/packages/xorg-lib/libxfont_1.3.3.bb @@ -0,0 +1,11 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 font rasterisation library" +LICENSE= "BSD-X" +DEPENDS += "freetype fontcacheproto xtrans fontsproto libfontenc" +PROVIDES = "xfont" +PE = "1" + +#SRC_URI += "file://no-scalable-crash.patch;patch=1" + +XORG_PN = "libXfont" diff --git a/packages/xorg-lib/libxft_2.1.12.bb b/packages/xorg-lib/libxft_2.1.12.bb index 8e54dac01d..c113951406 100644 --- a/packages/xorg-lib/libxft_2.1.12.bb +++ b/packages/xorg-lib/libxft_2.1.12.bb @@ -14,7 +14,7 @@ python do_package() { bb.build.exec_func('package_do_package', d) } -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ +FILES_${PN} = "${libdir}/lib*${SOLIBS}" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/pkgconfig \ ${datadir}/aclocal ${bindir} ${sbindir}" diff --git a/packages/xorg-lib/libxi_1.1.3.bb b/packages/xorg-lib/libxi_1.1.3.bb index 492d62af89..31e3b4906d 100644 --- a/packages/xorg-lib/libxi_1.1.3.bb +++ b/packages/xorg-lib/libxi_1.1.3.bb @@ -2,6 +2,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Input extension library" DEPENDS += "libxext inputproto" +PR = "r1" PE = "1" XORG_PN = "libXi" diff --git a/packages/xorg-lib/libxkbfile_1.0.5.bb b/packages/xorg-lib/libxkbfile_1.0.5.bb index 6229952548..a404180d49 100644 --- a/packages/xorg-lib/libxkbfile_1.0.5.bb +++ b/packages/xorg-lib/libxkbfile_1.0.5.bb @@ -3,4 +3,5 @@ require xorg-lib-common.inc DESCRIPTION = "X11 keyboard file manipulation library" LICENSE= "GPL" DEPENDS += "virtual/libx11 kbproto" +PR = "r1" PE = "1" diff --git a/packages/xorg-lib/libxmu_1.0.4.bb b/packages/xorg-lib/libxmu_1.0.4.bb index 396e2a2d4b..9a02bf82be 100644 --- a/packages/xorg-lib/libxmu_1.0.4.bb +++ b/packages/xorg-lib/libxmu_1.0.4.bb @@ -3,6 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 miscellaneous utility library" DEPENDS += "libxt libxext" PROVIDES = "xmu" +PR = "r1" PE = "1" XORG_PN = "libXmu" diff --git a/packages/xorg-lib/libxpm_3.5.7.bb b/packages/xorg-lib/libxpm_3.5.7.bb index caf8b365ee..75c10bf2c9 100644 --- a/packages/xorg-lib/libxpm_3.5.7.bb +++ b/packages/xorg-lib/libxpm_3.5.7.bb @@ -2,8 +2,8 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Pixmap library" LICENSE = "X-BSD" -DEPENDS += "libxt libxext libsm" -PR = "r0" +DEPENDS += "libxext libsm libxt" +PR = "r3" PE = "1" XORG_PN = "libXpm" diff --git a/packages/xorg-lib/libxrandr-sdk_1.2.2.bb b/packages/xorg-lib/libxrandr-sdk_1.2.2.bb new file mode 100644 index 0000000000..1f7d30dd06 --- /dev/null +++ b/packages/xorg-lib/libxrandr-sdk_1.2.2.bb @@ -0,0 +1,5 @@ +require libxrandr_${PV}.bb + +DEPENDS = "randrproto-sdk util-macros-sdk libxext-sdk libxrender-sdk" + +inherit sdk diff --git a/packages/xorg-lib/libxrandr_1.2.2.bb b/packages/xorg-lib/libxrandr_1.2.2.bb index 5a8ffb2b51..611859fd52 100644 --- a/packages/xorg-lib/libxrandr_1.2.2.bb +++ b/packages/xorg-lib/libxrandr_1.2.2.bb @@ -3,6 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Resize and Rotate extension library" LICENSE = "BSD-X" DEPENDS += "randrproto libxrender libxext" +PR = "r1" PE = "1" XORG_PN = "libXrandr" diff --git a/packages/xorg-lib/libxrender-sdk_0.9.4.bb b/packages/xorg-lib/libxrender-sdk_0.9.4.bb new file mode 100644 index 0000000000..3765c8a279 --- /dev/null +++ b/packages/xorg-lib/libxrender-sdk_0.9.4.bb @@ -0,0 +1,5 @@ +require libxrender_${PV}.bb + +DEPENDS = "xproto-sdk renderproto-sdk util-macros-sdk libx11-sdk" + +inherit sdk diff --git a/packages/xorg-lib/libxrender_0.9.4.bb b/packages/xorg-lib/libxrender_0.9.4.bb index ccf7b667f6..ad833a8259 100644 --- a/packages/xorg-lib/libxrender_0.9.4.bb +++ b/packages/xorg-lib/libxrender_0.9.4.bb @@ -2,7 +2,8 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Rendering Extension client library" LICENSE = "BSD-X" -DEPENDS += "virtual/libx11 renderproto xproto" +DEPENDS += "virtual/libx11 renderproto xproto xdmcp" +PR = "r1" PE = "1" XORG_PN = "libXrender" diff --git a/packages/xorg-lib/libxt_1.0.5.bb b/packages/xorg-lib/libxt_1.0.5.bb index 5b25c4b3a5..1c215da51d 100644 --- a/packages/xorg-lib/libxt_1.0.5.bb +++ b/packages/xorg-lib/libxt_1.0.5.bb @@ -13,7 +13,7 @@ EXTRA_OECONF += "--disable-install-makestrs --disable-xkb" do_compile() { ( unset CC LD CXX CCLD - oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs + oe_runmake -C util 'XT_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE -I${STAGING_INCDIR} ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makestrs ) || exit 1 oe_runmake } diff --git a/packages/xorg-lib/libxtst_1.0.3.bb b/packages/xorg-lib/libxtst_1.0.3.bb index 8d92200775..14e10ff285 100644 --- a/packages/xorg-lib/libxtst_1.0.3.bb +++ b/packages/xorg-lib/libxtst_1.0.3.bb @@ -3,7 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X Test Extension: client side library" DEPENDS += "libxext recordproto inputproto" PROVIDES = "xtst" -PR = "r0" +PR = "r1" PE = "1" XORG_PN = "libXtst" diff --git a/packages/xorg-lib/libxxf86dga_1.0.2.bb b/packages/xorg-lib/libxxf86dga_1.0.2.bb index 931f0d9d13..47492d7108 100644 --- a/packages/xorg-lib/libxxf86dga_1.0.2.bb +++ b/packages/xorg-lib/libxxf86dga_1.0.2.bb @@ -2,6 +2,7 @@ require xorg-lib-common.inc DESCRIPTION = "X11 Direct Graphics Access extension library" DEPENDS += "libxext xf86dgaproto" +PR = "r1" PE = "1" XORG_PN = "libXxf86dga" diff --git a/packages/xorg-lib/pixman/pixman-arm.patch b/packages/xorg-lib/pixman/pixman-arm.patch index b9280edf10..91dda03b7c 100644 --- a/packages/xorg-lib/pixman/pixman-arm.patch +++ b/packages/xorg-lib/pixman/pixman-arm.patch @@ -1,8 +1,14 @@ -diff --git a/configure.ac b/configure.ac -index 702bed0..59e0d99 100644 +From: Jeff Muizelaar <jmuizelaar@mozilla.com> +Date: Wed, 17 Sep 2008 19:53:20 +0000 (-0400) +Subject: Add support for ARMv6 SIMD fastpaths. +X-Git-Url: http://gitweb.freedesktop.org/?p=pixman.git;a=commitdiff;h=d0b181f347ef4720d130beee3f03196afbd28aba + +Add support for ARMv6 SIMD fastpaths. +--- + --- a/configure.ac +++ b/configure.ac -@@ -301,6 +301,44 @@ AC_SUBST(VMX_CFLAGS) +@@ -277,6 +277,44 @@ AC_SUBST(VMX_CFLAGS) AM_CONDITIONAL(USE_VMX, test $have_vmx_intrinsics = yes) @@ -47,12 +53,10 @@ index 702bed0..59e0d99 100644 AC_ARG_ENABLE(gtk, [AC_HELP_STRING([--enable-gtk], [enable tests using GTK+ [default=auto]])], -diff --git a/pixman/Makefile.am b/pixman/Makefile.am -index 4f046f1..2cad71a 100644 --- a/pixman/Makefile.am +++ b/pixman/Makefile.am -@@ -77,3 +77,16 @@ libpixman_sse_la_LIBADD = $(DEP_LIBS) - libpixman_1_la_LIBADD += libpixman-sse.la +@@ -79,3 +79,15 @@ libpixman_sse2_la_LIBADD = $(DEP_LIBS) + libpixman_1_la_LIBADD += libpixman-sse2.la endif +# arm code @@ -60,22 +64,18 @@ index 4f046f1..2cad71a 100644 +noinst_LTLIBRARIES += libpixman-arm.la +libpixman_arm_la_SOURCES = \ + pixman-arm.c \ -+ pixman-arm.h \ -+ pixman-combine32.h ++ pixman-arm.h +libpixman_arm_la_CFLAGS = $(DEP_CFLAGS) $(ARM_CFLAGS) +libpixman_arm_la_LIBADD = $(DEP_LIBS) +libpixman_1_la_LIBADD += libpixman-arm.la +endif + + -diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c -new file mode 100644 -index 0000000..5ea65cb --- /dev/null +++ b/pixman/pixman-arm.c -@@ -0,0 +1,433 @@ +@@ -0,0 +1,409 @@ +/* -+ * Copyright © 2008 Mozilla Corporation ++ * Copyright © 2008 Mozilla Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that @@ -104,7 +104,6 @@ index 0000000..5ea65cb +#endif + +#include "pixman-arm.h" -+#include "pixman-combine32.h" + +void +fbCompositeSrcAdd_8000x8000arm (pixman_op_t op, @@ -125,7 +124,6 @@ index 0000000..5ea65cb + int dstStride, srcStride; + uint16_t w; + uint8_t s, d; -+ uint16_t t; + + fbComposeGetStart (pSrc, xSrc, ySrc, uint8_t, srcStride, srcLine, 1); + fbComposeGetStart (pDst, xDst, yDst, uint8_t, dstStride, dstLine, 1); @@ -142,10 +140,8 @@ index 0000000..5ea65cb + { + s = *src; + d = *dst; -+ t = d + s; -+ /* s = t | (0 - (t >> 8)); */ -+ asm("usat %0, #8, %1" : "=r"(s) : "r"(t)); -+ *dst = s; ++ asm("uqadd8 %0, %1, %2" : "+r"(d) : "r"(s)); ++ *dst = d; + + dst++; + src++; @@ -164,10 +160,8 @@ index 0000000..5ea65cb + { + s = *src; + d = *dst; -+ t = d + s; -+ /* s = t | (0 - (t >> 8)); */ -+ asm("usat %0, #8, %1" : "=r"(s) : "r"(t)); -+ *dst = s; ++ asm("uqadd8 %0, %1, %2" : "+r"(d) : "r"(s)); ++ *dst = d; + + dst++; + src++; @@ -195,8 +189,8 @@ index 0000000..5ea65cb + uint32_t *srcLine, *src; + int dstStride, srcStride; + uint16_t w; -+ uint32_t component_mask = 0xff00ff; + uint32_t component_half = 0x800080; ++ uint32_t upper_component_mask = 0xff00ff00; + uint32_t alpha_mask = 0xff; + + fbComposeGetStart (pDst, xDst, yDst, uint32_t, dstStride, dstLine, 1); @@ -235,24 +229,19 @@ index 0000000..5ea65cb + /* = 255 - alpha */ + "sub r8, %[alpha_mask], r5, lsr #24\n\t" +#endif -+ "and r6, %[component_mask], r4\n\t" -+ "and r7, %[component_mask], r4, lsr #8\n\t" ++ "uxtb16 r6, r4\n\t" ++ "uxtb16 r7, r4, ror #8\n\t" + + /* multiply by 257 and divide by 65536 */ + "mla r6, r6, r8, %[component_half]\n\t" + "mla r7, r7, r8, %[component_half]\n\t" + -+ "and r8, %[component_mask], r6, lsr #8\n\t" -+ "and r9, %[component_mask], r7, lsr #8\n\t" -+ -+ "add r6, r6, r8\n\t" -+ "add r7, r7, r9\n\t" ++ "uxtab16 r6, r6, r6, ror #8\n\t" ++ "uxtab16 r7, r7, r7, ror #8\n\t" + -+ "and r6, %[component_mask], r6, lsr #8\n\t" -+ "and r7, %[component_mask], r7, lsr #8\n\t" -+ -+ /* recombine */ -+ "orr r6, r6, r7, lsl #8\n\t" ++ /* recombine the 0xff00ff00 bytes of r6 and r7 */ ++ "and r7, %[upper_component_mask]\n\t" ++ "uxtab16 r6, r7, r6, ror #8\n\t" + + "uqadd8 r5, r6, r5\n\t" + @@ -266,9 +255,9 @@ index 0000000..5ea65cb + "bne 1b\n\t" + "2:\n\t" + : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src) -+ : [component_half] "r" (component_half), [component_mask] "r" (component_mask), ++ : [component_half] "r" (component_half), [upper_component_mask] "r" (upper_component_mask), + [alpha_mask] "r" (alpha_mask) -+ : "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory" ++ : "r4", "r5", "r6", "r7", "r8", "cc", "memory" + ); + } +} @@ -292,7 +281,6 @@ index 0000000..5ea65cb + uint32_t mask; + int dstStride, srcStride; + uint16_t w; -+ uint32_t component_mask = 0xff00ff; + uint32_t component_half = 0x800080; + uint32_t alpha_mask = 0xff; + @@ -327,27 +315,24 @@ index 0000000..5ea65cb +#endif + "ldr r4, [%[dest]] \n\t" + -+ "and r6, %[component_mask], r5\n\t" -+ "and r7, %[component_mask], r5, lsr #8\n\t" ++ "uxtb16 r6, r5\n\t" ++ "uxtb16 r7, r5, ror #8\n\t" + + /* multiply by alpha (r8) then by 257 and divide by 65536 */ + "mla r6, r6, %[mask_alpha], %[component_half]\n\t" + "mla r7, r7, %[mask_alpha], %[component_half]\n\t" + -+ "and r8, %[component_mask], r6, lsr #8\n\t" -+ "and r9, %[component_mask], r7, lsr #8\n\t" -+ -+ "add r6, r6, r8\n\t" -+ "add r7, r7, r9\n\t" ++ "uxtab16 r6, r6, r6, ror #8\n\t" ++ "uxtab16 r7, r7, r7, ror #8\n\t" + -+ "and r6, %[component_mask], r6, lsr #8\n\t" -+ "and r7, %[component_mask], r7, lsr #8\n\t" ++ "uxtb16 r6, r6, ror #8\n\t" ++ "uxtb16 r7, r7, ror #8\n\t" + + /* recombine */ + "orr r5, r6, r7, lsl #8\n\t" + -+ "and r6, %[component_mask], r4\n\t" -+ "and r7, %[component_mask], r4, lsr #8\n\t" ++ "uxtb16 r6, r4\n\t" ++ "uxtb16 r7, r4, ror #8\n\t" + + /* 255 - alpha */ + "sub r8, %[alpha_mask], r5, lsr #24\n\t" @@ -356,14 +341,11 @@ index 0000000..5ea65cb + "mla r6, r6, r8, %[component_half]\n\t" + "mla r7, r7, r8, %[component_half]\n\t" + -+ "and r8, %[component_mask], r6, lsr #8\n\t" -+ "and r9, %[component_mask], r7, lsr #8\n\t" ++ "uxtab16 r6, r6, r6, ror #8\n\t" ++ "uxtab16 r7, r7, r7, ror #8\n\t" + -+ "add r6, r6, r8\n\t" -+ "add r7, r7, r9\n\t" -+ -+ "and r6, %[component_mask], r6, lsr #8\n\t" -+ "and r7, %[component_mask], r7, lsr #8\n\t" ++ "uxtb16 r6, r6, ror #8\n\t" ++ "uxtb16 r7, r7, ror #8\n\t" + + /* recombine */ + "orr r6, r6, r7, lsl #8\n\t" @@ -380,7 +362,7 @@ index 0000000..5ea65cb + "bne 1b\n\t" + "2:\n\t" + : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src) -+ : [component_half] "r" (component_half), [component_mask] "r" (component_mask), [mask_alpha] "r" (mask), ++ : [component_half] "r" (component_half), [mask_alpha] "r" (mask), + [alpha_mask] "r" (alpha_mask) + : "r4", "r5", "r6", "r7", "r8", "r9", "cc", "memory" + ); @@ -453,20 +435,17 @@ index 0000000..5ea65cb + "mla r6, %[src_lo], r5, %[component_half]\n\t" + "mla r7, %[src_hi], r5, %[component_half]\n\t" + -+ "and r8, %[component_mask], r6, lsr #8\n\t" -+ "and r5, %[component_mask], r7, lsr #8\n\t" -+ -+ "add r6, r6, r8\n\t" -+ "add r7, r7, r5\n\t" ++ "uxtab16 r6, r6, r6, ror #8\n\t" ++ "uxtab16 r7, r7, r7, ror #8\n\t" + -+ "and r6, %[component_mask], r6, lsr #8\n\t" -+ "and r7, %[component_mask], r7, lsr #8\n\t" ++ "uxtb16 r6, r6, ror #8\n\t" ++ "uxtb16 r7, r7, ror #8\n\t" + + /* recombine */ + "orr r5, r6, r7, lsl #8\n\t" + -+ "and r6, %[component_mask], r4\n\t" -+ "and r7, %[component_mask], r4, lsr #8\n\t" ++ "uxtb16 r6, r4\n\t" ++ "uxtb16 r7, r4, ror #8\n\t" + + /* we could simplify this to use 'sub' if we were + * willing to give up a register for alpha_mask */ @@ -477,14 +456,11 @@ index 0000000..5ea65cb + "mla r6, r6, r8, %[component_half]\n\t" + "mla r7, r7, r8, %[component_half]\n\t" + -+ "and r8, %[component_mask], r6, lsr #8\n\t" -+ "and r4, %[component_mask], r7, lsr #8\n\t" ++ "uxtab16 r6, r6, r6, ror #8\n\t" ++ "uxtab16 r7, r7, r7, ror #8\n\t" + -+ "add r6, r6, r8\n\t" -+ "add r7, r7, r4\n\t" -+ -+ "and r6, %[component_mask], r6, lsr #8\n\t" -+ "and r7, %[component_mask], r7, lsr #8\n\t" ++ "uxtb16 r6, r6, ror #8\n\t" ++ "uxtb16 r7, r7, ror #8\n\t" + + /* recombine */ + "orr r6, r6, r7, lsl #8\n\t" @@ -501,20 +477,17 @@ index 0000000..5ea65cb + "bne 1b\n\t" + "2:\n\t" + : [w] "+r" (w), [dest] "+r" (dst), [src] "+r" (src), [mask] "+r" (mask) -+ : [component_half] "r" (component_half), [component_mask] "r" (component_mask), ++ : [component_half] "r" (component_half), + [src_hi] "r" (src_hi), [src_lo] "r" (src_lo) + : "r4", "r5", "r6", "r7", "r8", "cc", "memory" + ); + } +} -diff --git a/pixman/pixman-arm.h b/pixman/pixman-arm.h -new file mode 100644 -index 0000000..258054a --- /dev/null +++ b/pixman/pixman-arm.h @@ -0,0 +1,94 @@ +/* -+ * Copyright © 2008 Mozilla Corporation ++ * Copyright © 2008 Mozilla Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that @@ -607,19 +580,17 @@ index 0000000..258054a + + +#endif /* USE_ARM */ -diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c -index b918219..e59e904 100644 --- a/pixman/pixman-pict.c +++ b/pixman/pixman-pict.c @@ -34,6 +34,7 @@ #include "pixman-mmx.h" #include "pixman-vmx.h" - #include "pixman-sse.h" + #include "pixman-sse2.h" +#include "pixman-arm.h" #include "pixman-combine32.h" #ifdef __GNUC__ -@@ -1479,6 +1480,26 @@ static const FastPathInfo vmx_fast_paths[] = +@@ -1479,6 +1480,26 @@ static const FastPathInfo vmx_fast_paths }; #endif @@ -646,12 +617,12 @@ index b918219..e59e904 100644 static const FastPathInfo c_fast_paths[] = { -@@ -1829,6 +1850,12 @@ pixman_image_composite (pixman_op_t op, +@@ -1829,6 +1850,12 @@ pixman_image_composite (pixman_op_t if (!info && pixman_have_vmx()) info = get_fast_path (vmx_fast_paths, op, pSrc, pMask, pDst, pixbuf); #endif -+#ifdef USE_ARM + ++#ifdef USE_ARM + if (!info && pixman_have_arm()) + info = get_fast_path (arm_fast_paths, op, pSrc, pMask, pDst, pixbuf); +#endif diff --git a/packages/xorg-lib/pixman/pixman-x888-565.patch b/packages/xorg-lib/pixman/pixman-x888-565.patch index a458e045b8..a3fa331710 100644 --- a/packages/xorg-lib/pixman/pixman-x888-565.patch +++ b/packages/xorg-lib/pixman/pixman-x888-565.patch @@ -1,14 +1,14 @@ -commit 8507756d8868b8d8c7a149bd2427a04262638156 -Author: Vladimir Vukicevic <vladimir@slide.(none)> -Date: Sat Sep 6 17:46:52 2008 -0700 +From: Vladimir Vukicevic <vladimir@slide.(none)> +Date: Wed, 17 Sep 2008 20:01:31 +0000 (-0400) +Subject: Add SRC x888x0565 C fast path +X-Git-Url: http://gitweb.freedesktop.org/?p=pixman.git;a=commitdiff;h=7180230d4d87c55dfef1e17a0cc3b125d45aa3a0 - Add SRC x888x0565 C fast path +Add SRC x888x0565 C fast path +--- -diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c -index eeefa33..b5fb0ff 100644 --- a/pixman/pixman-pict.c +++ b/pixman/pixman-pict.c -@@ -759,6 +759,46 @@ fbCompositeSrc_8888x0565 (pixman_op_t op, +@@ -759,6 +759,46 @@ fbCompositeSrc_8888x0565 (pixman_op_t op } } @@ -55,7 +55,7 @@ index eeefa33..b5fb0ff 100644 void fbCompositeSrcAdd_8000x8000 (pixman_op_t op, pixman_image_t * pSrc, -@@ -1568,6 +1608,10 @@ static const FastPathInfo c_fast_paths[] = +@@ -1568,6 +1608,10 @@ static const FastPathInfo c_fast_paths[] { PIXMAN_OP_SRC, PIXMAN_r5g6b5, PIXMAN_null, PIXMAN_r5g6b5, fbCompositeSrcSrc_nxn, 0 }, { PIXMAN_OP_SRC, PIXMAN_b5g6r5, PIXMAN_null, PIXMAN_b5g6r5, fbCompositeSrcSrc_nxn, 0 }, #endif diff --git a/packages/xorg-lib/pixman_0.12.0.bb b/packages/xorg-lib/pixman_0.12.0.bb new file mode 100644 index 0000000000..5d43adba30 --- /dev/null +++ b/packages/xorg-lib/pixman_0.12.0.bb @@ -0,0 +1,17 @@ +SECTION = "libs" +PRIORITY = "optional" +DESCRIPTION = "Low-level pixel manipulation library." +LICENSE = "X11" + +SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \ + file://pixman-arm.patch;patch=1 \ + file://pixman-x888-565.patch;patch=1 \ + " + +inherit autotools + +AUTOTOOLS_STAGE_PKGCONFIG = "1" +do_stage () { + autotools_stage_all +} + diff --git a/packages/xorg-lib/xtrans-native_1.0.4.bb b/packages/xorg-lib/xtrans-native_1.0.4.bb new file mode 100644 index 0000000000..c7988c7264 --- /dev/null +++ b/packages/xorg-lib/xtrans-native_1.0.4.bb @@ -0,0 +1,5 @@ +require xtrans_${PV}.bb + +DEPENDS = "util-macros-native" + +inherit native diff --git a/packages/xorg-lib/xtrans-sdk_1.0.4.bb b/packages/xorg-lib/xtrans-sdk_1.0.4.bb new file mode 100644 index 0000000000..9f671180b2 --- /dev/null +++ b/packages/xorg-lib/xtrans-sdk_1.0.4.bb @@ -0,0 +1,5 @@ +require xtrans_${PV}.bb + +DEPENDS = "util-macros-sdk" + +inherit sdk diff --git a/packages/xorg-lib/xtrans/abstract_socket_fix.patch b/packages/xorg-lib/xtrans/abstract_socket_fix.patch new file mode 100644 index 0000000000..197da0735d --- /dev/null +++ b/packages/xorg-lib/xtrans/abstract_socket_fix.patch @@ -0,0 +1,58 @@ +From 556a351de83fc6f401b02213dae95731553c216d Mon Sep 17 00:00:00 2001 +From: Loïc Minier <lool@dooz.org> +Date: Mon, 24 Mar 2008 19:38:27 +0000 +Subject: Bug #10489: Don't retry unix socket connect()s on ENOENT. + +If the socket isn't there, it's not gonna magically appear. Either it's +a server socket and you should have just waited for the SIGUSR1 from the +server, or it's a stale reference to an ICE socket. + +However, do retry once, so fallback from abstract to filesystem namespace +works. + +Originally Debian bug #385976. +--- +diff --git a/Xtranssock.c b/Xtranssock.c +index 8a7d2ec..da4afe9 100644 +--- a/Xtranssock.c ++++ b/Xtranssock.c +@@ -2146,8 +2146,13 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port) + errno = olderrno; + + /* +- * If the error was ENOENT, the server may be starting up +- * and we should try again. ++ * If the error was ENOENT, the server may be starting up; we used ++ * to suggest to try again in this case with ++ * TRANS_TRY_CONNECT_AGAIN, but this introduced problems for ++ * processes still referencing stale sockets in their environment. ++ * Hence, we now return a hard error, TRANS_CONNECT_FAILED, and it ++ * is suggested that higher level stacks handle retries on their ++ * level when they face a slow starting server. + * + * If the error was EWOULDBLOCK or EINPROGRESS then the socket + * was non-blocking and we should poll using select +@@ -2161,14 +2166,14 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port) + else if (olderrno == EINTR) + return TRANS_TRY_CONNECT_AGAIN; + else if (olderrno == ENOENT) { +- /* +- * If opening as abstract socket failed, try again "normally" +- */ +- if (abstract) ++ /* If opening as abstract socket failed, try again normally */ ++ if (abstract) { + ciptr->transptr->flags &= ~(TRANS_ABSTRACT); +- return TRANS_TRY_CONNECT_AGAIN; +- } +- else { ++ return TRANS_TRY_CONNECT_AGAIN; ++ } else { ++ return TRANS_CONNECT_FAILED; ++ } ++ } else { + PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n", + EGET(),0, 0); + +-- +cgit v0.7.2-37-g538c diff --git a/packages/xorg-lib/xtrans_1.2.1.bb b/packages/xorg-lib/xtrans_1.2.1.bb new file mode 100644 index 0000000000..75ba93c783 --- /dev/null +++ b/packages/xorg-lib/xtrans_1.2.1.bb @@ -0,0 +1,12 @@ +require xorg-lib-common.inc + +DESCRIPTION = "network API translation layer to insulate X applications and \ +libraries from OS network vageries." +PE = "1" +PR = "r0" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/xtrans" + +RDEPENDS_${PN}-dev = "" + +XORG_PN = "xtrans" diff --git a/packages/xorg-proto/bigreqsproto-sdk_1.0.2.bb b/packages/xorg-proto/bigreqsproto-sdk_1.0.2.bb new file mode 100644 index 0000000000..057013f92f --- /dev/null +++ b/packages/xorg-proto/bigreqsproto-sdk_1.0.2.bb @@ -0,0 +1,3 @@ +require bigreqsproto_${PV}.bb + +inherit sdk diff --git a/packages/xorg-proto/bigreqsproto_1.0.2.bb b/packages/xorg-proto/bigreqsproto_1.0.2.bb index 9f09fff7b7..ffe3bce8d8 100644 --- a/packages/xorg-proto/bigreqsproto_1.0.2.bb +++ b/packages/xorg-proto/bigreqsproto_1.0.2.bb @@ -2,3 +2,5 @@ require xorg-proto-common.inc PR = "r1" PE = "1" + +XORG_PN = "bigreqsproto" diff --git a/packages/xorg-proto/compositeproto_0.4.bb b/packages/xorg-proto/compositeproto_0.4.bb index f74413c551..b7bb50e579 100644 --- a/packages/xorg-proto/compositeproto_0.4.bb +++ b/packages/xorg-proto/compositeproto_0.4.bb @@ -2,3 +2,5 @@ require xorg-proto-common.inc CONFLICTS = "compositeext" PE = "1" + +XORG_PN = "compositeproto" diff --git a/packages/xorg-proto/damageproto_1.1.0.bb b/packages/xorg-proto/damageproto_1.1.0.bb index 202ec2874f..e7abb316ed 100644 --- a/packages/xorg-proto/damageproto_1.1.0.bb +++ b/packages/xorg-proto/damageproto_1.1.0.bb @@ -3,3 +3,5 @@ require xorg-proto-common.inc CONFLICTS = "damageext" PR = "r1" PE = "1" + +XORG_PN = "damageproto" diff --git a/packages/xorg-proto/fixesproto_4.0.bb b/packages/xorg-proto/fixesproto_4.0.bb index 1bc36e00da..f9bc9d9e3c 100644 --- a/packages/xorg-proto/fixesproto_4.0.bb +++ b/packages/xorg-proto/fixesproto_4.0.bb @@ -3,3 +3,5 @@ require xorg-proto-common.inc CONFLICTS = "fixesext" PR = "r1" PE = "1" + +XORG_PN = "fixesproto" diff --git a/packages/xorg-proto/glproto_1.4.9.bb b/packages/xorg-proto/glproto_1.4.9.bb index 037b4205ca..9f09fff7b7 100644 --- a/packages/xorg-proto/glproto_1.4.9.bb +++ b/packages/xorg-proto/glproto_1.4.9.bb @@ -1,3 +1,4 @@ require xorg-proto-common.inc -DESCRIPTION = "X11 OpenGL extension wire protocol" + +PR = "r1" PE = "1" diff --git a/packages/xorg-proto/inputproto-sdk_1.4.4.bb b/packages/xorg-proto/inputproto-sdk_1.4.4.bb new file mode 100644 index 0000000000..f0e1985bf9 --- /dev/null +++ b/packages/xorg-proto/inputproto-sdk_1.4.4.bb @@ -0,0 +1,3 @@ +require inputproto_${PV}.bb + +inherit sdk diff --git a/packages/xorg-proto/inputproto_1.4.4.bb b/packages/xorg-proto/inputproto_1.4.4.bb new file mode 100644 index 0000000000..e3a8b09f2b --- /dev/null +++ b/packages/xorg-proto/inputproto_1.4.4.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PR = "r1" +PE = "1" + +XORG_PN = "inputproto" diff --git a/packages/xorg-proto/kbproto-sdk_1.0.3.bb b/packages/xorg-proto/kbproto-sdk_1.0.3.bb new file mode 100644 index 0000000000..b821e4522e --- /dev/null +++ b/packages/xorg-proto/kbproto-sdk_1.0.3.bb @@ -0,0 +1,3 @@ +require kbproto_${PV}.bb + +inherit sdk diff --git a/packages/xorg-proto/kbproto_1.0.3.bb b/packages/xorg-proto/kbproto_1.0.3.bb index 9f09fff7b7..b3e9ffc365 100644 --- a/packages/xorg-proto/kbproto_1.0.3.bb +++ b/packages/xorg-proto/kbproto_1.0.3.bb @@ -2,3 +2,5 @@ require xorg-proto-common.inc PR = "r1" PE = "1" + +XORG_PN = "kbproto" diff --git a/packages/xorg-proto/printproto_1.0.4.bb b/packages/xorg-proto/printproto_1.0.4.bb index 3637929316..9f09fff7b7 100644 --- a/packages/xorg-proto/printproto_1.0.4.bb +++ b/packages/xorg-proto/printproto_1.0.4.bb @@ -1,3 +1,4 @@ require xorg-proto-common.inc +PR = "r1" PE = "1" diff --git a/packages/xorg-proto/randrproto-sdk_1.2.1.bb b/packages/xorg-proto/randrproto-sdk_1.2.1.bb new file mode 100644 index 0000000000..2759cb00cc --- /dev/null +++ b/packages/xorg-proto/randrproto-sdk_1.2.1.bb @@ -0,0 +1,3 @@ +require randrproto_${PV}.bb + +inherit sdk diff --git a/packages/xorg-proto/randrproto_1.2.1.bb b/packages/xorg-proto/randrproto_1.2.1.bb index eb8c7e0147..85000cc900 100644 --- a/packages/xorg-proto/randrproto_1.2.1.bb +++ b/packages/xorg-proto/randrproto_1.2.1.bb @@ -3,3 +3,5 @@ require xorg-proto-common.inc CONFLICTS = "randrext" PR = "r1" PE = "1" + +XORG_PN = "randrproto" diff --git a/packages/xorg-proto/renderproto-sdk_0.9.2.bb b/packages/xorg-proto/renderproto-sdk_0.9.2.bb new file mode 100644 index 0000000000..25ab90827f --- /dev/null +++ b/packages/xorg-proto/renderproto-sdk_0.9.2.bb @@ -0,0 +1,3 @@ +require renderproto_${PV}.bb + +inherit sdk diff --git a/packages/xorg-proto/renderproto_0.9.2.bb b/packages/xorg-proto/renderproto_0.9.2.bb index 39f4b66be7..d4e0983a8b 100644 --- a/packages/xorg-proto/renderproto_0.9.2.bb +++ b/packages/xorg-proto/renderproto_0.9.2.bb @@ -3,3 +3,5 @@ require xorg-proto-common.inc CONFLICTS = "renderext" PR = "r1" PE = "1" + +XORG_PN = "renderproto" diff --git a/packages/xorg-proto/xcmiscproto-sdk_1.1.2.bb b/packages/xorg-proto/xcmiscproto-sdk_1.1.2.bb new file mode 100644 index 0000000000..83c31204d2 --- /dev/null +++ b/packages/xorg-proto/xcmiscproto-sdk_1.1.2.bb @@ -0,0 +1,3 @@ +require xcmiscproto_${PV}.bb + +inherit sdk diff --git a/packages/xorg-proto/xcmiscproto_1.1.2.bb b/packages/xorg-proto/xcmiscproto_1.1.2.bb index 9f09fff7b7..8f48ecd9cd 100644 --- a/packages/xorg-proto/xcmiscproto_1.1.2.bb +++ b/packages/xorg-proto/xcmiscproto_1.1.2.bb @@ -2,3 +2,5 @@ require xorg-proto-common.inc PR = "r1" PE = "1" + +XORG_PN = "xcmiscproto" diff --git a/packages/xorg-proto/xextproto-sdk_7.0.2.bb b/packages/xorg-proto/xextproto-sdk_7.0.2.bb new file mode 100644 index 0000000000..3b182a02ff --- /dev/null +++ b/packages/xorg-proto/xextproto-sdk_7.0.2.bb @@ -0,0 +1,3 @@ +require xextproto_${PV}.bb + +inherit sdk diff --git a/packages/xorg-proto/xextproto_7.0.2.bb b/packages/xorg-proto/xextproto_7.0.2.bb index 9f09fff7b7..829d3cbe1e 100644 --- a/packages/xorg-proto/xextproto_7.0.2.bb +++ b/packages/xorg-proto/xextproto_7.0.2.bb @@ -2,3 +2,5 @@ require xorg-proto-common.inc PR = "r1" PE = "1" + +XORG_PN = "xextproto" diff --git a/packages/xorg-proto/xf86bigfontproto-sdk_1.1.2.bb b/packages/xorg-proto/xf86bigfontproto-sdk_1.1.2.bb new file mode 100644 index 0000000000..32b6280c04 --- /dev/null +++ b/packages/xorg-proto/xf86bigfontproto-sdk_1.1.2.bb @@ -0,0 +1,3 @@ +require xf86bigfontproto_${PV}.bb + +inherit sdk diff --git a/packages/xorg-proto/xf86bigfontproto_1.1.2.bb b/packages/xorg-proto/xf86bigfontproto_1.1.2.bb index 9f09fff7b7..f29fdb84a7 100644 --- a/packages/xorg-proto/xf86bigfontproto_1.1.2.bb +++ b/packages/xorg-proto/xf86bigfontproto_1.1.2.bb @@ -2,3 +2,5 @@ require xorg-proto-common.inc PR = "r1" PE = "1" + +XORG_PN = "xf86bigfontproto" diff --git a/packages/xorg-proto/xproto-sdk_7.0.12.bb b/packages/xorg-proto/xproto-sdk_7.0.12.bb new file mode 100644 index 0000000000..1c1a934bb0 --- /dev/null +++ b/packages/xorg-proto/xproto-sdk_7.0.12.bb @@ -0,0 +1,3 @@ +require xproto_${PV}.bb + +inherit sdk |