diff options
-rw-r--r-- | conf/checksums.ini | 20 | ||||
-rw-r--r-- | conf/distro/include/angstrom-glibc.inc | 4 | ||||
-rw-r--r-- | conf/distro/include/preferred-om-2008-versions.inc | 8 | ||||
-rw-r--r-- | conf/distro/include/preferred-xorg-versions.inc | 4 | ||||
-rw-r--r-- | packages/e17/illume-theme-illume_svn.bb | 33 | ||||
-rw-r--r-- | packages/gimp/gimp.inc | 9 | ||||
-rw-r--r-- | packages/gimp/gimp_2.6.0.bb | 8 | ||||
-rw-r--r-- | packages/gtk+/gtk+-1.2_1.2.10.bb | 1 | ||||
-rw-r--r-- | packages/libsdl/ballfield_1.0.bb | 8 | ||||
-rw-r--r-- | packages/tasks/task-x11-illume.bb | 27 | ||||
-rw-r--r-- | packages/tasks/task-x11.bb | 36 | ||||
-rw-r--r-- | packages/xmms/xmms_1.2.10.bb | 4 |
12 files changed, 151 insertions, 11 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 9c686ee6ad..9993342480 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1202,6 +1202,10 @@ sha256=c3648f02dd7d4dc8c0ef9a48089fda4ca47b81a977c838b17f55e6abf7f51447 md5=0d6d6614afdc468d214de4e66f9f5a26 sha256=d095165d256771c918b80f836feaf837aedc1362b2d67171013d3ab7ac5ee47f +[http://olofson.net/download/ballfield-1.0.tar.gz] +md5=cdb21380b0584db2a69ac10094bb97e1 +sha256=926688080fd75a8d6eab6c6ea1168dc03c591625c21af492ec0c13d816573516 + [http://talinux.fi.tal.org/pub/talinux/sources/balsa-2.0.17.tar.bz2] md5=851db68728ed9adea615eb2f249fa1ee sha256=c450b49ce9903d97ed5e4aa788b388e014c0eddcfc038b000237f67cd4528a3b @@ -1726,6 +1730,10 @@ sha256=d6bcb5ad03da810c24703dde423b28aca49109591764dfe447e8a2ad5713be1d md5=2b999b2fb7798e1737d1fff8fac602ef sha256=6232e93205acbc8c705f44f15977aae158550c99a384f41606cff26c16393be0 +[http://downloads.sourceforge.net/boost/boost_1_36_0.tar.bz2] +md5=328bfec66c312150e4c2a78dcecb504b +sha256=9a4a0cfbbd227c20a13519a2c41f2e707dc0d89e518a3c7bfcd381f7b7fbcdef + [http://downloads.sourceforge.net/asio/boost_asio_0_3_7.tar.bz2] md5=e006cde4b4a28cfce95e43710cd126a9 sha256=ade3663edc611d558f5a383abccd0a9ab87d6168f422ef4c2a38775e8b7ca575 @@ -3350,11 +3358,11 @@ sha256=6f51ebdf0e18bea58d18f79e8ffebb797fe57bdf44b96dff9d84b70467af7841 md5=3654bbbf01deeb0d804df194e1b1a2b3 sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce -[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz] +[ftp://ftp.gentoo.mesh-solutions.com/mirrors/gentoo/distfiles/fakeroot_1.7.1.tar.gz] md5=3654bbbf01deeb0d804df194e1b1a2b3 sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce -[ftp://ftp.gentoo.mesh-solutions.com/mirrors/gentoo/distfiles/fakeroot_1.7.1.tar.gz] +[ftp://ftp.pl.debian.org/pub/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz] md5=3654bbbf01deeb0d804df194e1b1a2b3 sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce @@ -4306,6 +4314,10 @@ sha256=ddeafb632050bba9163416c4a18c4cb8706b922c0fa99a0c216176584826a9dc md5=98add4a1ca6af2e20f80ae3f5a84a922 sha256=78d209885768790be6d610d275430e6e775392b6384d326401a7ecc13606c539 +[ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-2.6.0.tar.bz2] +md5=e5ac955fee8b376d431e4693027d7640 +sha256=f4055ea8f1815d7dcca6bf0159af70489243d63a14dcfaf2a994af062d829ca8 + [http://downloads.sourceforge.net/g-inspector/ginspector-20050529.tar.bz2] md5=0a8474e0d90b139b1baa70b097a4fd51 sha256=7f55ec02b5ab9e86c64f5718be64854fd9c64899908e580e1a9759421ac3b436 @@ -4826,6 +4838,10 @@ sha256=a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48 md5=6b6d22662df5101b308c465a722c43ce sha256=4aae09bf99ab2642308b0042eb18b75bc18ff33969a7431bba60b09cc2f600f4 +[http://downloads.sourceforge.net/gnuplot/gnuplot-4.2.4.tar.gz] +md5=3cde3b9232a2d81715bbaf75e1c87ecc +sha256=2a20701410a21307c404a9d10ad9fdf699bb92fa0a919797213208d80b080913 + [ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-3.0.4.tar.gz] md5=d04b446fc76687272e64259d36d78b0e sha256=2374cbf6df3568d7cef16ba6a11802e52e37d88719f704dff40d4fff9f81d313 diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 2ba21b20ad..4ee402fd59 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -22,13 +22,13 @@ TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm' # perl has some problems, see http://bugs.openembedded.net/show_bug.cgi?id=1616 # [23:00] oxo: glibc (any version) on sparc does not like (repeat me) "-Os" -FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -Os" +FULL_OPTIMIZATION = "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2" FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1" FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -O2" FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2" -BUILD_OPTIMIZATION = "-Os" +BUILD_OPTIMIZATION = "-O2" BUILD_OPTIMIZATION_pn-perl = "-O1" BUILD_OPTIMIZATION_pn-glibc = "-O2" BUILD_OPTIMIZATION_sparc = "-O2" diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 6a7f3d5213..518b2e3cfd 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -340,8 +340,8 @@ PREFERRED_VERSION_faad2 ?= "2.0" PREFERRED_VERSION_fakechroot ?= "2.5" PREFERRED_VERSION_fakechroot-native ?= "2.5" PREFERRED_VERSION_fakeconnect ?= "1.2.1" -PREFERRED_VERSION_fakeroot ?= "1.7.1" -PREFERRED_VERSION_fakeroot-native ?= "1.7.1" +PREFERRED_VERSION_fakeroot ?= "1.9.6" +PREFERRED_VERSION_fakeroot-native ?= "1.9.6" PREFERRED_VERSION_fam ?= "2.7.0" PREFERRED_VERSION_farsight ?= "0.1.5" PREFERRED_VERSION_fastcgi ?= "2.4.0" @@ -1092,8 +1092,8 @@ PREFERRED_VERSION_libxinerama ?= "1.0.2" PREFERRED_VERSION_libxine-x11 ?= "1.0" PREFERRED_VERSION_libxkbfile ?= "1.0.4" PREFERRED_VERSION_libxkbui ?= "1.0.2" -PREFERRED_VERSION_libxml2 ?= "2.6.29" -PREFERRED_VERSION_libxml2-native ?= "2.6.29" +PREFERRED_VERSION_libxml2 ?= "2.7.2" +PREFERRED_VERSION_libxml2-native ?= "2.7.2" PREFERRED_VERSION_libxml-parser-perl ?= "2.34" PREFERRED_VERSION_libxml-parser-perl-native ?= "2.34" PREFERRED_VERSION_libxmu ?= "1.0.3" diff --git a/conf/distro/include/preferred-xorg-versions.inc b/conf/distro/include/preferred-xorg-versions.inc index 05136138fc..ea99842fd6 100644 --- a/conf/distro/include/preferred-xorg-versions.inc +++ b/conf/distro/include/preferred-xorg-versions.inc @@ -15,9 +15,9 @@ PREFERRED_VERSION_gccmakedep ?= "1.0.2" PREFERRED_VERSION_glproto ?= "1.4.8" PREFERRED_VERSION_imake ?= "1.0.2" PREFERRED_VERSION_inputproto ?= "1.4.2" -PREFERRED_VERSION_inputproto-native ?= "1.4.1" +PREFERRED_VERSION_inputproto-native ?= "1.4.2" PREFERRED_VERSION_kbproto ?= "1.0.3" -PREFERRED_VERSION_kbproto-native ?= "1.0.2" +PREFERRED_VERSION_kbproto-native ?= "1.0.3" PREFERRED_VERSION_libapplewm ?= "1.0.0" PREFERRED_VERSION_libdmx ?= "1.0.2" PREFERRED_VERSION_libfontenc ?= "1.0.4" diff --git a/packages/e17/illume-theme-illume_svn.bb b/packages/e17/illume-theme-illume_svn.bb new file mode 100644 index 0000000000..eb313e074c --- /dev/null +++ b/packages/e17/illume-theme-illume_svn.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Illume theme for Illume E module" +HOMEPAGE = "http://www.enlightenment.org/" +LICENSE = "MIT/BSD" +DEPENDS = "edje-native eet-native" +PV = "0.0+${PR}-svnr${SRCREV}" +PR = "r1" + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=THEMES/b_and_w;proto=http" +S = "${WORKDIR}/THEMES/b_and_w" + +do_compile() { + edje_cc illume.edc + edje_cc illume_init.edc +} + +do_install() { + install -d ${D}${sysconfdir}/enlightenment + install -d ${D}${datadir}/enlightenment/data/themes/ + install -d ${D}${datadir}/enlightenment/data/init/ + + # FIXME: hack. should modify profile.cfg and nto use enlightenment_start.oe + echo 'E_PROFILE="-profile illume"' > ${D}${sysconfdir}/enlightenment/default_profile + + install -m 0644 ${S}/illume.edj ${D}${datadir}/enlightenment/data/themes/ + install -m 0644 ${S}/illume_init.edj ${D}${datadir}/enlightenment/data/init/ +} + +RPROVIDES_${PN} = "illume-theme" +CONFFILES_${PN} = "${sysconfdir}/enlightenment/default_profile" +FILES_${PN} = "${sysconfdir}/enlightenment ${datadir}/enlightenment" + +PACKAGE_ARCH_${PN} = "all" + diff --git a/packages/gimp/gimp.inc b/packages/gimp/gimp.inc index 171ac79786..b62f544fea 100644 --- a/packages/gimp/gimp.inc +++ b/packages/gimp/gimp.inc @@ -29,7 +29,14 @@ do_stage() { autotools_stage_all } -FILES_${PN} += "${datadir}/icons \ +python populate_packages_prepend () { + cv_libdir = bb.data.expand('${libdir}', d) + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'GIMP %s library', extra_depends='', allow_links=True) +} + +FILES_${PN} = "${bindir} ${sysconfdir} ${datadir}/gimp* ${libdir}/gimp* \ + ${datadir}/applications \ + ${datadir}/icons \ ${datadir}/mime-info \ ${datadir}/application-registry " diff --git a/packages/gimp/gimp_2.6.0.bb b/packages/gimp/gimp_2.6.0.bb new file mode 100644 index 0000000000..8470b6d5a8 --- /dev/null +++ b/packages/gimp/gimp_2.6.0.bb @@ -0,0 +1,8 @@ +require gimp.inc + +DEPENDS += "lcms gegl hal" + +SRC_URI = "ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-${PV}.tar.bz2 \ + " + + diff --git a/packages/gtk+/gtk+-1.2_1.2.10.bb b/packages/gtk+/gtk+-1.2_1.2.10.bb index 55e7ac69d8..aa9ba641d5 100644 --- a/packages/gtk+/gtk+-1.2_1.2.10.bb +++ b/packages/gtk+/gtk+-1.2_1.2.10.bb @@ -17,6 +17,7 @@ inherit autotools pkgconfig flow-lossage do_configure_prepend() { install -d m4 rm -f ltconfig libtool ltmain.sh aclocal.m4 + sed -i -e s:AM_LC_MESSAGES:gt_LC_MESSAGES:g acinclude.m4 } FILES_${PN} += "${datadir}/themes" diff --git a/packages/libsdl/ballfield_1.0.bb b/packages/libsdl/ballfield_1.0.bb new file mode 100644 index 0000000000..9b44be5516 --- /dev/null +++ b/packages/libsdl/ballfield_1.0.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "This is a cute little "3D" sprite demo using SDL and SDL_image." +DEPENDS = "vrtual/libsdl libsdl-image" +LICENSE = "GPLv2" + +SRC_URI = "http://olofson.net/download/ballfield-${PV}.tar.gz" + +inherit autotools + diff --git a/packages/tasks/task-x11-illume.bb b/packages/tasks/task-x11-illume.bb new file mode 100644 index 0000000000..a477c6e8c5 --- /dev/null +++ b/packages/tasks/task-x11-illume.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "The Illume Windowing Environment -- install this task to get the Enlightenment Window Manager + the Illume environment." +SECTION = "x11/wm" +LICENSE = "MIT" +PV = "1.0" +PR = "r0" + +# WORK IN PROGRESS + +inherit task + +# Default illume theme +ILLUME_THEME ?= "illume-theme-illume" + +RDEPENDS_${PN} = "\ + task-x11-server \ + task-x11-utils \ +# xserver-kdrive-splash-illume \ + \ + e-wm \ + illume \ + illume-config-illume \ + illume-dicts-english-us \ + illume-keyboards-default \ + illume-keyboards-numbers \ + illume-keyboards-terminal \ + ${ILLUME_THEME} \ +" diff --git a/packages/tasks/task-x11.bb b/packages/tasks/task-x11.bb new file mode 100644 index 0000000000..ad5ca3a412 --- /dev/null +++ b/packages/tasks/task-x11.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "The X Window System -- install this task to get a client/server based display multiplexer." +SECTION = "x11/server" +LICENSE = "MIT" +PV = "1.0" +PR = "r0" + +# WORK IN PROGRESS + +inherit task + +PACKAGES += "\ + ${PN}-server \ + ${PN}-utils \ +" + +RRECOMMENDS_${PN} = "\ + ${PN}-server \ + ${PN}-utils \ +" + +# Some machines don't set a *runtime* provider for X, so default to Xfbdev here +# virtual/xserver won't work, since the kdrive recipes will build multiple xserver packages +XSERVER ?= "xserver-kdrive-fbdev" + +RDEPENDS_${PN}-server = "\ + ${XSERVER} \ +" + +RDEPENDS_${PN}-utils = "\ + xserver-kdrive-common \ + xserver-nodm-init \ + xauth \ + xhost \ + xset \ + xrandr \ +" diff --git a/packages/xmms/xmms_1.2.10.bb b/packages/xmms/xmms_1.2.10.bb index 21b928192a..dfde697809 100644 --- a/packages/xmms/xmms_1.2.10.bb +++ b/packages/xmms/xmms_1.2.10.bb @@ -27,6 +27,10 @@ EXTRA_OECONF = "--disable-opengl --disable-esd \ do_configure_prepend() { cp ${WORKDIR}/acinclude.m4 ${S} rm ${S}/libxmms/acinclude.m4 || true + for i in $(find . -name "Makefile*") ; do + sed -i -e 's:MKINSTALLDIRS = @MKINSTALLDIRS@:MKINSTALLDIRS = @mkdir_p@:g' \ + -e 's:$(SHELL) $(MKINSTALLDIRS):$(MKINSTALLDIRS):g' $i + done } do_install_append() { |