diff options
-rw-r--r-- | packages/ipkg/ipkg.inc | 9 | ||||
-rw-r--r-- | packages/ipkg/ipkg_0.99.154.bb | 2 | ||||
-rw-r--r-- | packages/linux/ixp4xx-kernel_2.6.16.bb | 2 | ||||
-rw-r--r-- | packages/netbase/netbase_4.21.bb | 4 | ||||
-rw-r--r-- | packages/openssh/openssh_4.0p1.bb | 8 | ||||
-rw-r--r-- | packages/slugos-init/files/conffiles | 5 | ||||
-rw-r--r-- | packages/slugos-init/slugos-init_0.10.bb | 2 | ||||
-rw-r--r-- | packages/xcb/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/xcb/libxcb_0.9.bb | 72 | ||||
-rw-r--r-- | packages/xcb/libxcb_git.bb | 78 | ||||
-rw-r--r-- | packages/xcb/xcb-demo_0.1.bb | 12 | ||||
-rw-r--r-- | packages/xcb/xcb-demo_git.bb | 16 | ||||
-rw-r--r-- | packages/xcb/xcb-proto_0.9.bb | 14 | ||||
-rw-r--r-- | packages/xcb/xcb-proto_git.bb | 18 | ||||
-rw-r--r-- | packages/xcb/xcb-util_0.1.bb | 42 | ||||
-rw-r--r-- | packages/xcb/xcb-util_git.bb | 46 | ||||
-rw-r--r-- | packages/xlibs/libx11_git.bb | 32 | ||||
-rw-r--r-- | packages/xproto/xcb-proto_0.9.bb | 6 |
18 files changed, 350 insertions, 18 deletions
diff --git a/packages/ipkg/ipkg.inc b/packages/ipkg/ipkg.inc index f535cfbef0..8fc6c9efe0 100644 --- a/packages/ipkg/ipkg.inc +++ b/packages/ipkg/ipkg.inc @@ -16,6 +16,11 @@ S = "${WORKDIR}/ipkg/C" inherit autotools pkgconfig +# Define a variable to allow distros to run configure earlier. +# (for example, to enable loading of ethernet kernel modules before networking starts) +IPKG_INIT_POSITION = "98" +IPKG_INIT_POSITION_slugos = "41" + pkg_postinst_ipkg () { #!/bin/sh if [ "x$D" != "x" ]; then @@ -23,8 +28,8 @@ if [ "x$D" != "x" ]; then # this happens at S98 where our good 'ole packages script used to run echo -e "#!/bin/sh ipkg-cl configure -" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure - chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure +" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure + chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${IPKG_INIT_POSITION}configure fi update-alternatives --install ${bindir}/ipkg ipkg ${bindir}/ipkg-cl 100 diff --git a/packages/ipkg/ipkg_0.99.154.bb b/packages/ipkg/ipkg_0.99.154.bb index 9285c61819..de6af147b6 100644 --- a/packages/ipkg/ipkg_0.99.154.bb +++ b/packages/ipkg/ipkg_0.99.154.bb @@ -1,2 +1,2 @@ include ipkg.inc -PR = "r2" +PR = "r3" diff --git a/packages/linux/ixp4xx-kernel_2.6.16.bb b/packages/linux/ixp4xx-kernel_2.6.16.bb index d4fe2dfa5c..ca8a64e9ed 100644 --- a/packages/linux/ixp4xx-kernel_2.6.16.bb +++ b/packages/linux/ixp4xx-kernel_2.6.16.bb @@ -3,7 +3,7 @@ # Increment PR_CONFIG for changes to the ixp4xx-kernel specific # defconfig (do *NOT* increment anything in here for changes # to other kernel configs!) -PR_CONFIG = "1" +PR_CONFIG = "2" # # Increment the number below (i.e. the digits after PR) when # making changes within this file or for changes to the patches diff --git a/packages/netbase/netbase_4.21.bb b/packages/netbase/netbase_4.21.bb index 89a7d3c7cd..d5526776eb 100644 --- a/packages/netbase/netbase_4.21.bb +++ b/packages/netbase/netbase_4.21.bb @@ -2,7 +2,7 @@ SECTION = "base" DESCRIPTION = "This package provides the necessary \ infrastructure for basic TCP/IP based networking." LICENSE = "GPL" -PR = "r9" +PR = "r10" inherit update-rc.d @@ -12,7 +12,7 @@ INITSCRIPT_PARAMS = "start 40 S . stop 40 0 6 1 ." INITSCRIPT_PARAMS_openmn = "start 85 1 2 3 4 5 . stop 85 0 6 1 ." # On SlugOS (NSLU2) delay the stop until after network apps have exited # Do not stop in single user - there's no way to sulogin! -INITSCRIPT_PARAMS_slugos = "start 40 S 0 6 ." +INITSCRIPT_PARAMS_slugos = "start 42 S 0 6 ." SRC_URI = "${DEBIAN_MIRROR}/main/n/netbase/netbase_${PV}.tar.gz \ file://options \ diff --git a/packages/openssh/openssh_4.0p1.bb b/packages/openssh/openssh_4.0p1.bb index ee5df1421d..2c0e035c4b 100644 --- a/packages/openssh/openssh_4.0p1.bb +++ b/packages/openssh/openssh_4.0p1.bb @@ -1,8 +1,6 @@ DEPENDS = "zlib openssl" -RREPLACES_openssh = "dropbear" RCONFLICTS_openssh = "dropbear" -RREPLACES_openssh-sshd = "dropbear" RCONFLICTS_openssh-sshd = "dropbear" SECTION = "console/network" @@ -17,7 +15,7 @@ used to provide applications with a secure communication channel." HOMEPAGE = "http://www.openssh.org/" LICENSE = "BSD" MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>" -PR = "r8" +PR = "r10" SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.gz \ file://configure.patch;patch=1 \ @@ -107,5 +105,5 @@ else fi } -CONFFILES_openssh-sshd_nylon = "${sysconfdir}/ssh/sshd_config" -CONFFILES_openssh-ssh_nylon = "${sysconfdir}/ssh/ssh_config" +CONFFILES_openssh-sshd = "${sysconfdir}/ssh/sshd_config" +CONFFILES_openssh-ssh = "${sysconfdir}/ssh/ssh_config" diff --git a/packages/slugos-init/files/conffiles b/packages/slugos-init/files/conffiles index 68dd26d897..e1408a3227 100644 --- a/packages/slugos-init/files/conffiles +++ b/packages/slugos-init/files/conffiles @@ -31,6 +31,10 @@ diff etc/default/usbd preserve etc/defaultdomain preserve etc/dropbear/dropbear_dss_host_key preserve etc/dropbear/dropbear_rsa_host_key +preserve etc/ssh/ssh_host_dsa_key +preserve etc/ssh/ssh_host_dsa_key.pub +preserve etc/ssh/ssh_host_rsa_key +preserve etc/ssh/ssh_host_rsa_key.pub preserve etc/fstab preserve etc/group preserve etc/gshadow @@ -48,3 +52,4 @@ preserve etc/resolv.conf preserve etc/shadow preserve etc/syslog.conf preserve etc/timezone +preserve root/.ssh/authorized_keys diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb index 8b80bf4fda..c57f985f81 100644 --- a/packages/slugos-init/slugos-init_0.10.bb +++ b/packages/slugos-init/slugos-init_0.10.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r60" +PR = "r61" SRC_URI = "file://boot/flash \ file://boot/disk \ diff --git a/packages/xcb/.mtn2git_empty b/packages/xcb/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xcb/.mtn2git_empty diff --git a/packages/xcb/libxcb_0.9.bb b/packages/xcb/libxcb_0.9.bb new file mode 100644 index 0000000000..95ea4ab1a1 --- /dev/null +++ b/packages/xcb/libxcb_0.9.bb @@ -0,0 +1,72 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PR = "r0" + +PARALLEL_MAKE = "" +DEPENDS = "xcb-proto xproto libxau" +# DEPENDS += "xsltproc-native gperf-native" + +SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-0.9.tar.bz2" + +PACKAGES = "libxcb libxcb-dev libxcbcomposite libxcbcomposite-dev \ + libxcbdamage libxcbdamage-dev libxcbdpms libxcbdpms-dev \ + libxcbglx libxcbglx-dev libxcbrandr libxcbrandr-dev \ + libxcbrecord libxcbrecord-dev libxcbrender libxcbrender-dev \ + libxcbres libxcbres-dev libxcbscreensaver libxcbscreensaver-dev \ + libxcbshape libxcbshape-dev libxcbshm libxcbshm-dev \ + libxcbsync libxcbsync-dev libxcbxevie libxcbxevie-dev \ + libxcbxf86dri libxcbxf86dri-dev libxcbxfixes libxcbxfixes-dev \ + libxcbxprint libxcbxprint-dev libxcbxtest libxcbxtest-dev \ + libxcbxv libxcbxv-dev libxcbxvmc libxcbxvmc-dev" + +FILES_${PN} = "${libdir}/libXCB.so.*" +FILES_${PN}-dev = "${libdir}/libXCB.* ${libdir}/pkgconfig/xcb.pc ${includedir}/X11/XCB/xcb.h ${includedir}/X11/XCB/xcb_types.h \ + ${includedir}/X11/XCB/xc_misc.h ${includedir}/X11/XCB/bigreq.h ${includedir}/X11/XCB/xproto.h \ + ${includedir}/X11/XCB/xcbxlib.h ${includedir}/X11/XCB/xcbext.h" +FILES_libxcbcomposite = "${libdir}/libXCBcomposite.so*" +FILES_libxcbcomposite-dev = "${libdir}/libXCBcomposite.* ${libdir}/pkgconfig/xcb-composite.pc ${includedir}/X11/XCB/composite.h" +FILES_libxcbdamage = "${libdir}/libXCBdamage.so.*" +FILES_libxcbdamage-dev = "${libdir}/libXCBdamage.* ${libdir}/pkgconfig/xcb-damage.pc ${includedir}/X11/XCB/damage.h" +FILES_libxcbdpms = "${libdir}/libXCBdpms.so.*" +FILES_libxcbdpms-dev = "${libdir}/libXCBdpms.* ${libdir}/pkgconfig/xcb-dpms.pc ${includedir}/X11/XCB/dpms.h" +FILES_libxcbglx = "${libdir}/libXCBglx.so.*" +FILES_libxcbglx-dev = "${libdir}/libXCBglx.* ${libdir}/pkgconfig/xcb-glx.pc ${includedir}/X11/XCB/glx.h" +FILES_libxcbrandr = "${libdir}/libXCBrandr.so.*" +FILES_libxcbrandr-dev = "${libdir}/libXCBrandr.* ${libdir}/pkgconfig/xcb-randr.pc ${includedir}/X11/XCB/randr.h" +FILES_libxcbrecord = "${libdir}/libXCBrecord.so.*" +FILES_libxcbrecord-dev = "${libdir}/libXCBrecord.* ${libdir}/pkgconfig/xcb-record.pc ${includedir}/X11/XCB/record.h" +FILES_libxcbrender = "${libdir}/libXCBrender.so.*" +FILES_libxcbrender-dev = "${libdir}/libXCBrender.* ${libdir}/pkgconfig/xcb-render.pc ${includedir}/X11/XCB/render.h" +FILES_libxcbres = "${libdir}/libXCBres.so.*" +FILES_libxcbres-dev = "${libdir}/libXCBres.* ${libdir}/pkgconfig/xcb-res.pc ${includedir}/X11/XCB/res.h" +FILES_libxcbscreensaver = "${libdir}/libXCBscreensaver.so.*" +FILES_libxcbscreensaver-dev = "${libdir}/libXCBscreensaver.* ${libdir}/pkgconfig/xcb-screensaver.pc ${includedir}/X11/XCB/screensaver.h" +FILES_libxcbshape = "${libdir}/libXCBshape.so.*" +FILES_libxcbshape-dev = "${libdir}/libXCBshape.* ${libdir}/pkgconfig/xcb-shape.pc ${includedir}/X11/XCB/shape.h" +FILES_libxcbshm = "${libdir}/libXCBshm.so.*" +FILES_libxcbshm-dev = "${libdir}/libXCBshm.* ${libdir}/pkgconfig/xcb-shm.pc ${includedir}/X11/XCB/shm.h" +FILES_libxcbsync = "${libdir}/libXCBsync.so.*" +FILES_libxcbsync-dev = "${libdir}/libXCBsync.* ${libdir}/pkgconfig/xcb-sync.pc ${includedir}/X11/XCB/sync.h" +FILES_libxcbxevie = "${libdir}/libXCBxevie.so.*" +FILES_libxcbxevie-dev = "${libdir}/libXCBxevie.* ${libdir}/pkgconfig/xcb-xevie.pc ${includedir}/X11/XCB/xevie.h" +FILES_libxcbxf86dri = "${libdir}/libXCBxf86dri.so.*" +FILES_libxcbxf86dri-dev = "${libdir}/libXCBxf86dri.* ${libdir}/pkgconfig/xcb-xf86dri.pc ${includedir}/X11/XCB/xf86dri.h" +FILES_libxcbxfixes = "${libdir}/libXCBxfixes.so.*" +FILES_libxcbxfixes-dev = "${libdir}/libXCBxfixes.* ${libdir}/pkgconfig/xcb-xfixes.pc ${includedir}/X11/XCB/xfixes.h" +FILES_libxcbxprint = "${libdir}/libXCBxprint.so.*" +FILES_libxcbxprint-dev = "${libdir}/libXCBxprint.* ${libdir}/pkgconfig/xcb-xprint.pc ${includedir}/X11/XCB/xprint.h" +FILES_libxcbxtest = "${libdir}/libXCBxtest.so.*" +FILES_libxcbxtest-dev = "${libdir}/libXCBxtest.* ${libdir}/pkgconfig/xcb-xtest.pc ${includedir}/X11/XCB/xtest.h" +FILES_libxcbxv = "${libdir}/libXCBxv.so.*" +FILES_libxcbxv-dev = "${libdir}/libXCBxv.* ${libdir}/pkgconfig/xcb-xv.pc ${includedir}/X11/XCB/xv.h" +FILES_libxcbxvmc = "${libdir}/libXCBxvmc.so.*" +FILES_libxcbxvmc-dev = "${libdir}/libXCBxvmc.* ${libdir}/pkgconfig/xcb-xvmc.pc ${includedir}/X11/XCB/xvmc.h" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/libxcb_git.bb b/packages/xcb/libxcb_git.bb new file mode 100644 index 0000000000..1ca23bc946 --- /dev/null +++ b/packages/xcb/libxcb_git.bb @@ -0,0 +1,78 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PV = "0.9+git" +PR = "r0" + +PARALLEL_MAKE = "" + + +DEPENDS = "xcb-proto xproto libxau" +# DEPENDS += "xsltproc-native gperf-native" + +SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" +S = "${WORKDIR}/git/xcb" + +PACKAGES = "libxcb libxcb-dev libxcbcomposite libxcbcomposite-dev \ + libxcbdamage libxcbdamage-dev libxcbdpms libxcbdpms-dev \ + libxcbglx libxcbglx-dev libxcbrandr libxcbrandr-dev \ + libxcbrecord libxcbrecord-dev libxcbrender libxcbrender-dev \ + libxcbres libxcbres-dev libxcbscreensaver libxcbscreensaver-dev \ + libxcbshape libxcbshape-dev libxcbshm libxcbshm-dev \ + libxcbsync libxcbsync-dev libxcbxevie libxcbxevie-dev \ + libxcbxf86dri libxcbxf86dri-dev libxcbxfixes libxcbxfixes-dev \ + libxcbxprint libxcbxprint-dev libxcbxtest libxcbxtest-dev \ + libxcbxv libxcbxv-dev libxcbxvmc libxcbxvmc-dev" + +FILES_${PN} = "${libdir}/libXCB.so.*" +FILES_${PN}-dev = "${libdir}/libXCB.* ${libdir}/pkgconfig/xcb.pc ${includedir}/X11/XCB/xcb.h ${includedir}/X11/XCB/xcb_types.h \ + ${includedir}/X11/XCB/xc_misc.h ${includedir}/X11/XCB/bigreq.h ${includedir}/X11/XCB/xproto.h \ + ${includedir}/X11/XCB/xcbxlib.h ${includedir}/X11/XCB/xcbext.h" +FILES_libxcbcomposite = "${libdir}/libXCBcomposite.so*" +FILES_libxcbcomposite-dev = "${libdir}/libXCBcomposite.* ${libdir}/pkgconfig/xcb-composite.pc ${includedir}/X11/XCB/composite.h" +FILES_libxcbdamage = "${libdir}/libXCBdamage.so.*" +FILES_libxcbdamage-dev = "${libdir}/libXCBdamage.* ${libdir}/pkgconfig/xcb-damage.pc ${includedir}/X11/XCB/damage.h" +FILES_libxcbdpms = "${libdir}/libXCBdpms.so.*" +FILES_libxcbdpms-dev = "${libdir}/libXCBdpms.* ${libdir}/pkgconfig/xcb-dpms.pc ${includedir}/X11/XCB/dpms.h" +FILES_libxcbglx = "${libdir}/libXCBglx.so.*" +FILES_libxcbglx-dev = "${libdir}/libXCBglx.* ${libdir}/pkgconfig/xcb-glx.pc ${includedir}/X11/XCB/glx.h" +FILES_libxcbrandr = "${libdir}/libXCBrandr.so.*" +FILES_libxcbrandr-dev = "${libdir}/libXCBrandr.* ${libdir}/pkgconfig/xcb-randr.pc ${includedir}/X11/XCB/randr.h" +FILES_libxcbrecord = "${libdir}/libXCBrecord.so.*" +FILES_libxcbrecord-dev = "${libdir}/libXCBrecord.* ${libdir}/pkgconfig/xcb-record.pc ${includedir}/X11/XCB/record.h" +FILES_libxcbrender = "${libdir}/libXCBrender.so.*" +FILES_libxcbrender-dev = "${libdir}/libXCBrender.* ${libdir}/pkgconfig/xcb-render.pc ${includedir}/X11/XCB/render.h" +FILES_libxcbres = "${libdir}/libXCBres.so.*" +FILES_libxcbres-dev = "${libdir}/libXCBres.* ${libdir}/pkgconfig/xcb-res.pc ${includedir}/X11/XCB/res.h" +FILES_libxcbscreensaver = "${libdir}/libXCBscreensaver.so.*" +FILES_libxcbscreensaver-dev = "${libdir}/libXCBscreensaver.* ${libdir}/pkgconfig/xcb-screensaver.pc ${includedir}/X11/XCB/screensaver.h" +FILES_libxcbshape = "${libdir}/libXCBshape.so.*" +FILES_libxcbshape-dev = "${libdir}/libXCBshape.* ${libdir}/pkgconfig/xcb-shape.pc ${includedir}/X11/XCB/shape.h" +FILES_libxcbshm = "${libdir}/libXCBshm.so.*" +FILES_libxcbshm-dev = "${libdir}/libXCBshm.* ${libdir}/pkgconfig/xcb-shm.pc ${includedir}/X11/XCB/shm.h" +FILES_libxcbsync = "${libdir}/libXCBsync.so.*" +FILES_libxcbsync-dev = "${libdir}/libXCBsync.* ${libdir}/pkgconfig/xcb-sync.pc ${includedir}/X11/XCB/sync.h" +FILES_libxcbxevie = "${libdir}/libXCBxevie.so.*" +FILES_libxcbxevie-dev = "${libdir}/libXCBxevie.* ${libdir}/pkgconfig/xcb-xevie.pc ${includedir}/X11/XCB/xevie.h" +FILES_libxcbxf86dri = "${libdir}/libXCBxf86dri.so.*" +FILES_libxcbxf86dri-dev = "${libdir}/libXCBxf86dri.* ${libdir}/pkgconfig/xcb-xf86dri.pc ${includedir}/X11/XCB/xf86dri.h" +FILES_libxcbxfixes = "${libdir}/libXCBxfixes.so.*" +FILES_libxcbxfixes-dev = "${libdir}/libXCBxfixes.* ${libdir}/pkgconfig/xcb-xfixes.pc ${includedir}/X11/XCB/xfixes.h" +FILES_libxcbxprint = "${libdir}/libXCBxprint.so.*" +FILES_libxcbxprint-dev = "${libdir}/libXCBxprint.* ${libdir}/pkgconfig/xcb-xprint.pc ${includedir}/X11/XCB/xprint.h" +FILES_libxcbxtest = "${libdir}/libXCBxtest.so.*" +FILES_libxcbxtest-dev = "${libdir}/libXCBxtest.* ${libdir}/pkgconfig/xcb-xtest.pc ${includedir}/X11/XCB/xtest.h" +FILES_libxcbxv = "${libdir}/libXCBxv.so.*" +FILES_libxcbxv-dev = "${libdir}/libXCBxv.* ${libdir}/pkgconfig/xcb-xv.pc ${includedir}/X11/XCB/xv.h" +FILES_libxcbxvmc = "${libdir}/libXCBxvmc.so.*" +FILES_libxcbxvmc-dev = "${libdir}/libXCBxvmc.* ${libdir}/pkgconfig/xcb-xvmc.pc ${includedir}/X11/XCB/xvmc.h" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/xcb-demo_0.1.bb b/packages/xcb/xcb-demo_0.1.bb new file mode 100644 index 0000000000..9f7ab023c6 --- /dev/null +++ b/packages/xcb/xcb-demo_0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PR = "r0" + +DEPENDS = "libxcb xcb-util" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-demo-0.1.tar.bz2" + +inherit autotools pkgconfig diff --git a/packages/xcb/xcb-demo_git.bb b/packages/xcb/xcb-demo_git.bb new file mode 100644 index 0000000000..6a98d240a3 --- /dev/null +++ b/packages/xcb/xcb-demo_git.bb @@ -0,0 +1,16 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PV = "0.1+git" +PR = "r0" + +DEPENDS = "libxcb xcb-util" + +SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" +S = "${WORKDIR}/git/xcb-demo" + +inherit autotools pkgconfig diff --git a/packages/xcb/xcb-proto_0.9.bb b/packages/xcb/xcb-proto_0.9.bb new file mode 100644 index 0000000000..481f2c5a25 --- /dev/null +++ b/packages/xcb/xcb-proto_0.9.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PR = "r0" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-0.9.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/xcb-proto_git.bb b/packages/xcb/xcb-proto_git.bb new file mode 100644 index 0000000000..55b941a321 --- /dev/null +++ b/packages/xcb/xcb-proto_git.bb @@ -0,0 +1,18 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PV = "0.9+git" +PR = "r0" + +SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" +S = "${WORKDIR}/git/xcb-proto" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/xcb-util_0.1.bb b/packages/xcb/xcb-util_0.1.bb new file mode 100644 index 0000000000..949d3db116 --- /dev/null +++ b/packages/xcb/xcb-util_0.1.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PR = "r0" + +DEPENDS = "libxcb" +# DEPENDS += "gperf-native" + +PARALLEL_MAKE = "" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-util-0.1.tar.bz2" + +PACKAGES = "libxcbatom libxcbatom-dev libxcbaux libxcbaux-dev libxcbevent libxcbevent-dev libxcbicccm libxcbicccm-dev \ + libxcbimage libxcbimage-dev libxcbkeysyms libxcbkeysyms-dev libxcbproperty libxcbproperty-dev \ + libxcbreply libxcbreply-dev libxcbwm libxcbwm-dev" + +FILES_libxcbatom = "${libdir}/libXCBAtom.so.*" +FILES_libxcbatom-dev = "${libdir}/libXCBAtom.* ${libdir}/pkgconfig/xcb-atom.pc ${includedir}/X11/XCB/xcb_atom.h" +FILES_libxcbaux = "${libdir}/libXCBAux.so.*" +FILES_libxcbaux-dev = "${libdir}/libXCBAux.* ${libdir}/pkgconfig/xcb-aux.pc ${includedir}/X11/XCB/xcb_aux.h" +FILES_libxcbevent = "${libdir}/libXCBEvent.so.*" +FILES_libxcbevent-dev = "${libdir}/libXCBEvent.* ${libdir}/pkgconfig/xcb-event.pc ${includedir}/X11/XCB/xcb_event.h" +FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*" +FILES_libxcbicccm-dev = "${libdir}/libICCCM.* ${libdir}/pkgconfig/xcb-icccm.pc ${includedir}/X11/XCB/xcb_icccm.h" +FILES_libxcbimage = "${libdir}/libXCBImage.so.*" +FILES_libxcbimage-dev = "${libdir}/libXCBImage.* ${libdir}/pkgconfig/xcb-image.pc ${includedir}/X11/XCB/xcb_image.h" +FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*" +FILES_libxcbkeysyms-dev = "${libdir}/libXCBKeysyms.* ${libdir}/pkgconfig/xcb-keysyms.pc ${includedir}/X11/XCB/xcb_keysyms.h" +FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*" +FILES_libxcbproperty-dev = "${libdir}/libXCBProperty.* ${libdir}/pkgconfig/xcb-property.pc ${includedir}/X11/XCB/xcb_property.h" +FILES_libxcbreply = "${libdir}/libXCBReply.so.*" +FILES_libxcbreply-dev = "${libdir}/libXCBReply.* ${libdir}/pkgconfig/xcb-reply.pc ${includedir}/X11/XCB/xcb_reply.h" +FILES_libxcbwm = "${libdir}/libXCBWM.so.*" +FILES_libxcbwm-dev = "${libdir}/libXCBWM.* ${libdir}/pkgconfig/xcb-wm.pc ${includedir}/X11/XCB/xcb_wm.h" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xcb/xcb-util_git.bb b/packages/xcb/xcb-util_git.bb new file mode 100644 index 0000000000..5e8c7d6536 --- /dev/null +++ b/packages/xcb/xcb-util_git.bb @@ -0,0 +1,46 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" +MAINTAINER = "Philipp Zabel <philipp.zabel@gmail.com>" +PV = "0.1+git" +PR = "r0" + +DEPENDS = "libxcb" +# DEPENDS += "gperf-native" + +PARALLEL_MAKE = "" + +SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" +S = "${WORKDIR}/git/xcb-util" + +PACKAGES = "libxcbatom libxcbatom-dev libxcbaux libxcbaux-dev libxcbevent libxcbevent-dev libxcbicccm libxcbicccm-dev \ + libxcbimage libxcbimage-dev libxcbkeysyms libxcbkeysyms-dev libxcbproperty libxcbproperty-dev \ + libxcbreply libxcbreply-dev libxcbwm libxcbwm-dev" + +FILES_libxcbatom = "${libdir}/libXCBAtom.so.*" +FILES_libxcbatom-dev = "${libdir}/libXCBAtom.* ${libdir}/pkgconfig/xcb-atom.pc ${includedir}/X11/XCB/xcb_atom.h" +FILES_libxcbaux = "${libdir}/libXCBAux.so.*" +FILES_libxcbaux-dev = "${libdir}/libXCBAux.* ${libdir}/pkgconfig/xcb-aux.pc ${includedir}/X11/XCB/xcb_aux.h" +FILES_libxcbevent = "${libdir}/libXCBEvent.so.*" +FILES_libxcbevent-dev = "${libdir}/libXCBEvent.* ${libdir}/pkgconfig/xcb-event.pc ${includedir}/X11/XCB/xcb_event.h" +FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*" +FILES_libxcbicccm-dev = "${libdir}/libICCCM.* ${libdir}/pkgconfig/xcb-icccm.pc ${includedir}/X11/XCB/xcb_icccm.h" +FILES_libxcbimage = "${libdir}/libXCBImage.so.*" +FILES_libxcbimage-dev = "${libdir}/libXCBImage.* ${libdir}/pkgconfig/xcb-image.pc ${includedir}/X11/XCB/xcb_image.h" +FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*" +FILES_libxcbkeysyms-dev = "${libdir}/libXCBKeysyms.* ${libdir}/pkgconfig/xcb-keysyms.pc ${includedir}/X11/XCB/xcb_keysyms.h" +FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*" +FILES_libxcbproperty-dev = "${libdir}/libXCBProperty.* ${libdir}/pkgconfig/xcb-property.pc ${includedir}/X11/XCB/xcb_property.h" +FILES_libxcbreply = "${libdir}/libXCBReply.so.*" +FILES_libxcbreply-dev = "${libdir}/libXCBReply.* ${libdir}/pkgconfig/xcb-reply.pc ${includedir}/X11/XCB/xcb_reply.h" +FILES_libxcbwm = "${libdir}/libXCBWM.so.*" +FILES_libxcbwm-dev = "${libdir}/libXCBWM.* ${libdir}/pkgconfig/xcb-wm.pc ${includedir}/X11/XCB/xcb_wm.h" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xlibs/libx11_git.bb b/packages/xlibs/libx11_git.bb new file mode 100644 index 0000000000..ed6623f03a --- /dev/null +++ b/packages/xlibs/libx11_git.bb @@ -0,0 +1,32 @@ +DEFAULT_PREFERENCE = "-1" + +DESCRIPTION = "Xlib/XCB: Xlib with XCB transport" +SECTION = "x11/libs" +PRIORITY = "optional" +LICENSE = "XFree86" + +DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" +PROVIDES = "x11" + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" +FILES_${PN}-locale += "${datadir}/X11/locale" + +SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF="--enable-malloc0returnsnull" + +do_compile() { + ( + 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 + ) + rm -f ${STAGING_INCDIR}/X11/Xlib.h + oe_runmake +} + +do_stage() { + autotools_stage_all +} diff --git a/packages/xproto/xcb-proto_0.9.bb b/packages/xproto/xcb-proto_0.9.bb deleted file mode 100644 index ba5e3ed953..0000000000 --- a/packages/xproto/xcb-proto_0.9.bb +++ /dev/null @@ -1,6 +0,0 @@ -include proto-common.inc - -SRC_URI = "http://xcb.freedesktop.org/dist/${P}.tar.bz2" - - - |