From 44eb0c3efd56414c6fad6e2c2ea18a0c0e40d086 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Mon, 25 May 2009 13:06:35 +0400 Subject: seppuku: add support for working behind the proxy Signed-off-by: Dmitry Eremin-Solenikov --- classes/seppuku.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/classes/seppuku.bbclass b/classes/seppuku.bbclass index ab8096eb45..546738dde8 100644 --- a/classes/seppuku.bbclass +++ b/classes/seppuku.bbclass @@ -319,6 +319,12 @@ python seppuku_eventhandler() { passw = bb.data.getVar("SEPPUKU_PASS", data, True) product = bb.data.getVar("SEPPUKU_PRODUCT", data, True) component = bb.data.getVar("SEPPUKU_COMPONENT", data, True) + proxy = bb.data.getVar('HTTP_PROXY', data, True ) + if (proxy): + phl = urllib2.ProxyHandler({'http' : proxy}) + poster.add_handler(phl) + opener.add_handler(phl) + # evil hack to figure out what is going on debug_file = open(os.path.join(bb.data.getVar("TMPDIR", data, True),"..","seppuku-log"),"a") -- cgit v1.2.3 From dd8aab1a3728f1300f913bae5de15df1034dda0a Mon Sep 17 00:00:00 2001 From: Pratheesh Gangadhar Date: Mon, 25 May 2009 02:33:52 +0530 Subject: quake3: Add pandora (actually omap3) quake3 gles port --- recipes/quake/files/quake3_makefile.patch | 29 +++++++++++++++++++++++ recipes/quake/quake3-pandora-gles_git.bb | 39 +++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 recipes/quake/files/quake3_makefile.patch create mode 100644 recipes/quake/quake3-pandora-gles_git.bb diff --git a/recipes/quake/files/quake3_makefile.patch b/recipes/quake/files/quake3_makefile.patch new file mode 100644 index 0000000000..b9e94577b2 --- /dev/null +++ b/recipes/quake/files/quake3_makefile.patch @@ -0,0 +1,29 @@ +--- /tmp/Makefile 2009-05-25 14:59:16.000000000 +0530 ++++ git/pandora/Makefile 2009-05-25 15:07:46.000000000 +0530 +@@ -64,14 +64,14 @@ ARFLAGS=ar rv + DLL_ONLY=true + ARCH=arm + VENDOR=dec +- BASE_CFLAGS = -mcpu=cortex-a8 -mtune=cortex-a8 -march=armv7-a -mfloat-abi=softfp \ +- -mfpu=neon -ftree-vectorize -ffast-math -fomit-frame-pointer \ ++ BASE_CFLAGS = -O3 -mtune=cortex-a8 -march=armv7-a -mfloat-abi=softfp \ ++ -mfpu=neon -ffast-math -fomit-frame-pointer \ + -fno-strict-aliasing -fsingle-precision-constant \ + -I$(PNDSDK)/usr/include -DIPHONE -DBOTLIB -DDLL_ONLY -DC_ONLY -D__arm__ -DSHLIB_SUFFIX="\"so\"" -D_PANDORA_ + + THREAD_LDFLAGS=-lpthread + +-LDFLAGS=-L$(PNDSDK)/usr/lib -ldl -lm -lX11 -lXau -lXdmcp -lXxf86vm -lXext ++LDFLAGS+=-L$(PNDSDK)/usr/lib -ldl -lm -lX11 -lXau -lXdmcp -lXxf86vm -lXext + + GL_CFAGS = -I$(PNDSDK)/usr/X11R6/include + +@@ -126,7 +126,7 @@ DO_NASM=nasm -f elf -o $@ $< + DO_DED_CC=$(CC) -DDEDICATED -DC_ONLY $(CFLAGS) -o $@ -c $< + + #### DEFAULT TARGET +-default:build_debug ++default:build_release + + debug: build_debug + release: build_release diff --git a/recipes/quake/quake3-pandora-gles_git.bb b/recipes/quake/quake3-pandora-gles_git.bb new file mode 100644 index 0000000000..d468d34a44 --- /dev/null +++ b/recipes/quake/quake3-pandora-gles_git.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "OpenGL ES quake3 port to the omap3-pandora" +LICENSE = "GPL" + +SRCREV = "39d08bf6e81f7cdc29380858dfe671b0722332a3" +PR_append = "+gitr${SRCREV}" +PV = "0.0" + +DEPENDS = "virtual/libsdl libgles-omap3" + +SRC_URI = "git://github.com/Cpasjuste/quake3_pandora_gles.git;branch=master;protocol=git \ + file://quake3_makefile.patch;patch=1 \ +" +S = "${WORKDIR}/git" + +export PNDSDK="${STAGING_DIR}" + +do_compile() { + cd pandora + sed -i -e s:=arm-none-linux-gnueabi-:=${TARGET_PREFIX}:g Makefile + oe_runmake +} + +do_install() { + install -d ${D}/${bindir} + install -d ${D}/${libdir}/quake3/baseq3/ + + install -m 0755 ${S}/pandora/release${TARGET_ARCH}/baseq3/*.so ${D}/${libdir}/quake3/baseq3 + install -m 0755 ${S}/pandora/release${TARGET_ARCH}/quake3 ${D}/${libdir}/quake3 + + install -m 0755 ${S}/pandora/autoexec.cfg ${D}/${libdir}/quake3/baseq3 + install -m 0755 ${S}/pandora/autoexec_high_detail.cfg ${D}/${libdir}/quake3 + install -m 0755 ${S}/pandora/autoexec_medium_detail.cfg ${D}/${libdir}/quake3 + install -m 0755 ${S}/pandora/autoexec_low_detail.cfg ${D}/${libdir}/quake3 + install -m 0755 ${S}/pandora/run.sh ${D}/${libdir}/quake3 +} + +FILES_${PN} += "${libdir}" +FILES_${PN}-dbg += "${libdir}/quake3/.debug ${libdir}/quake3/baseq3/.debug" + -- cgit v1.2.3 From fdfbacd481c9467d821b8fd8e345168e4b60d3a4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 25 May 2009 13:24:48 +0200 Subject: udev 141: merge in some fixes from poky --- recipes/udev/udev_141.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb index e7438fb4d6..bbcdfeb7fe 100644 --- a/recipes/udev/udev_141.bb +++ b/recipes/udev/udev_141.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" # Untested DEFAULT_PREFERENCE = "-1" -PR = "r6" +PR = "r7" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://mount.blacklist \ @@ -64,6 +64,9 @@ do_install () { mv ${D}${base_libdir}/udev/rules.d ${D}${sysconfdir}/udev/ ln -sf ${sysconfdir}/udev/rules.d ${D}${base_libdir}/udev/ + cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/ + cp ${S}/rules/packages/* ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules -- cgit v1.2.3 From ad4e2d75a9d07bce3ff23fffd51f34b39ef97f68 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 25 May 2009 00:51:19 +0000 Subject: udev: include udev-utils into udev rootfs The reason for the move is that udevadm binary is executed from udev init.d script. Signed-off-by: Ihar Hrachyshka Signed-off-by: Koen Kooi --- recipes/udev/udev_141.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb index bbcdfeb7fe..e687989e9f 100644 --- a/recipes/udev/udev_141.bb +++ b/recipes/udev/udev_141.bb @@ -6,7 +6,10 @@ LICENSE = "GPL" # Untested DEFAULT_PREFERENCE = "-1" -PR = "r7" +PR = "r8" + +# needed for init.d script +RDEPENDS_udev += "udev-utils" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://mount.blacklist \ -- cgit v1.2.3 From 9da5f51503ce6a0c9b8a0f5e6068c6fa19d44049 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Mon, 25 May 2009 16:46:13 +0400 Subject: lowpan-tools: fix building 1) upstream has changed naming to be 'lowpan-tools' instead of 'lowpan-utils' 2) bump git revision (and thus PR) to use upstream fix for supporting installation w/o manpages and add '--disable-manpages' to EXTRA_OECONF Signed-off-by: Dmitry Eremin-Solenikov --- recipes/lowpan-tools/lowpan-tools_git.bb | 20 ++++++++++++++++++++ recipes/lowpan-utils/lowpan-utils_git.bb | 21 --------------------- 2 files changed, 20 insertions(+), 21 deletions(-) create mode 100644 recipes/lowpan-tools/lowpan-tools_git.bb delete mode 100644 recipes/lowpan-utils/lowpan-utils_git.bb diff --git a/recipes/lowpan-tools/lowpan-tools_git.bb b/recipes/lowpan-tools/lowpan-tools_git.bb new file mode 100644 index 0000000000..1fde23218d --- /dev/null +++ b/recipes/lowpan-tools/lowpan-tools_git.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "LoWPAN utilities (IEEE802.15.4)" +LICENSE = "GPL" +SRCREV = "e9e80a2eefa7aadbbb15bef1519b373e2e907aa0" +#SRC_URI = "git://github.com/lumag/lowpan-utils.git;protocol=git" +SRC_URI = "git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee;protocol=git" +DEPENDS = "libnl bison-native flex-native" +PR = "r6" + +S = "${WORKDIR}/git" +PACKAGES += "${PN}-tests-dbg" +PACKAGES += "${PN}-tests" +FILES_${PN} = "${sbindir}/iz ${sbindir}/izconfig \ + ${bindir}/izchat ${bindir}/izlisten ${sbindir}/izcoordinator \ + ${sbindir}/izattach" +FILES_${PN}-tests = "${libexecdir}/lowpan-tools ${libdir}/python*/site-packages" +FILES_${PN}-tests-dbg = "${libexecdir}/lowpan-tools/.debug" + +EXTRA_OECONF = "--disable-manpages" + +inherit autotools_stage diff --git a/recipes/lowpan-utils/lowpan-utils_git.bb b/recipes/lowpan-utils/lowpan-utils_git.bb deleted file mode 100644 index 89a5e438ab..0000000000 --- a/recipes/lowpan-utils/lowpan-utils_git.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "LoWPAN utilities (IEEE802.15.4)" -LICENSE = "GPL" -SRCREV = "master" -SRC_URI = "git://github.com/lumag/lowpan-utils.git;protocol=git" -DEPENDS = "libnl bison-native flex-native" -PR = "r4" - -S = "${WORKDIR}/git" -PACKAGES += "${PN}-tests-dbg" -PACKAGES += "${PN}-tests" -FILES_${PN} = "${sbindir}/iz ${sbindir}/izconfig \ - ${bindir}/izchat ${bindir}/izlisten ${sbindir}/izcoordinator \ - ${sbindir}/izattach" -FILES_${PN}-tests = "${libexecdir}/zigbee ${libdir}/python*/site-packages" -FILES_${PN}-tests-dbg = "${libexecdir}/zigbee/.debug" - -inherit autotools - -do_stage() { - autotools_stage_all -} -- cgit v1.2.3 From fb657b18aa1733ee5145ba7e6a4e20391bdcdf2d Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Mon, 25 May 2009 16:48:40 +0400 Subject: tinderclient: support sitting behind proxy Signed-off-by: Dmitry Eremin-Solenikov --- classes/tinderclient.bbclass | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 0b7fc1d843..d2b2b33898 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -1,10 +1,20 @@ -def tinder_http_post(server, selector, content_type, body): +def tinder_http_post(d, server, selector, content_type, body): import httplib + from bb import data # now post it for i in range(0,5): try: - h = httplib.HTTP(server) - h.putrequest('POST', selector) + proxy = data.getVar('HTTP_PROXY', d, True ) + if (proxy): + if (proxy.endswith('/')): + proxy = proxy[:-1] + if (proxy.startswith('http://')): + proxy = proxy[7:] + h = httplib.HTTP(proxy) + h.putrequest('POST', 'http://%s%s' % (server, selector)) + else: + h = httplib.HTTP(server) + h.putrequest('POST', selector) h.putheader('content-type', content_type) h.putheader('content-length', str(len(body))) h.endheaders() @@ -12,8 +22,8 @@ def tinder_http_post(server, selector, content_type, body): errcode, errmsg, headers = h.getreply() #print errcode, errmsg, headers return (errcode,errmsg, headers, h.file) - except: - print "Error sending the report!" + except Exception, e: + print "Error sending the report! ", e # try again pass @@ -116,7 +126,7 @@ def tinder_build_start(d): #print "selector %s and url %s" % (selector, url) # now post it - errcode, errmsg, headers, h_file = tinder_http_post(server,selector,content_type, body) + errcode, errmsg, headers, h_file = tinder_http_post(d,server,selector,content_type, body) #print errcode, errmsg, headers report = h_file.read() @@ -151,7 +161,7 @@ def tinder_send_http(d, status, _log): new_log = _log while len(new_log) > 0: content_type, body = tinder_format_http_post(d,status,new_log[0:18000]) - errcode, errmsg, headers, h_file = tinder_http_post(server,selector,content_type, body) + errcode, errmsg, headers, h_file = tinder_http_post(d,server,selector,content_type, body) #print errcode, errmsg, headers #print h.file.read() new_log = new_log[18000:] -- cgit v1.2.3 From 37eb1b93e1e65b0246d749349bf406781e7ac7f0 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Mon, 25 May 2009 16:52:11 +0400 Subject: at91*: drop PREFERRED_VERSION_u-boot u-boot 2009.01 for all of these boards already conatains DEFAULT_PREFERENCE_at91xxx = "1". Drop the version specification from machine configs to lower confusion. Signed-off-by: Dmitry Eremin-Solenikov --- conf/machine/at91cap9adk.conf | 1 - conf/machine/at91sam9260ek.conf | 1 - conf/machine/at91sam9261ek.conf | 1 - conf/machine/at91sam9263ek.conf | 1 - conf/machine/at91sam9g20ek.conf | 1 - conf/machine/at91sam9rlek.conf | 1 - 6 files changed, 6 deletions(-) diff --git a/conf/machine/at91cap9adk.conf b/conf/machine/at91cap9adk.conf index 50549dabf6..87311e9be4 100644 --- a/conf/machine/at91cap9adk.conf +++ b/conf/machine/at91cap9adk.conf @@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" UBOOT_MACHINE = "at91cap9adk_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf index 3882c118fb..ea93b02c45 100644 --- a/conf/machine/at91sam9260ek.conf +++ b/conf/machine/at91sam9260ek.conf @@ -10,7 +10,6 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" UBOOT_MACHINE = "at92sam9260ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf index a3a9be6dc1..d48ee7c9e2 100644 --- a/conf/machine/at91sam9261ek.conf +++ b/conf/machine/at91sam9261ek.conf @@ -10,7 +10,6 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" UBOOT_MACHINE = "at92sam9261ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf index e633148172..f052170aed 100644 --- a/conf/machine/at91sam9263ek.conf +++ b/conf/machine/at91sam9263ek.conf @@ -10,7 +10,6 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" UBOOT_MACHINE = "at91sam9263ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf index 38078b6d03..7dc6ba0d53 100644 --- a/conf/machine/at91sam9g20ek.conf +++ b/conf/machine/at91sam9g20ek.conf @@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" UBOOT_MACHINE = "at91sam9g20ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf index ba19cb3e00..228b7befb3 100644 --- a/conf/machine/at91sam9rlek.conf +++ b/conf/machine/at91sam9rlek.conf @@ -10,7 +10,6 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "2009.01" UBOOT_MACHINE = "at92sam9rlek_config" PREFERRED_VERSION_at91bootstrap = "2.10" -- cgit v1.2.3 From 588564f0656e911c89c4d85f0f8b7ef57859a0f4 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Mon, 25 May 2009 18:05:43 +0400 Subject: at91*: use correct u-boot configs Signed-off-by: Dmitry Eremin-Solenikov --- conf/machine/at91sam9260ek.conf | 2 +- conf/machine/at91sam9261ek.conf | 2 +- conf/machine/at91sam9rlek.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf index ea93b02c45..9a7ca9af62 100644 --- a/conf/machine/at91sam9260ek.conf +++ b/conf/machine/at91sam9260ek.conf @@ -10,7 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -UBOOT_MACHINE = "at92sam9260ek_config" +UBOOT_MACHINE = "at91sam9260ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf index d48ee7c9e2..79f275f483 100644 --- a/conf/machine/at91sam9261ek.conf +++ b/conf/machine/at91sam9261ek.conf @@ -10,7 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -UBOOT_MACHINE = "at92sam9261ek_config" +UBOOT_MACHINE = "at91sam9261ek_config" PREFERRED_VERSION_at91bootstrap = "2.10" diff --git a/conf/machine/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf index 228b7befb3..f7a78dcf75 100644 --- a/conf/machine/at91sam9rlek.conf +++ b/conf/machine/at91sam9rlek.conf @@ -10,7 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28" PREFERRED_PROVIDER_xserver = "xserver-kdrive" KERNEL_IMAGETYPE = "uImage" -UBOOT_MACHINE = "at92sam9rlek_config" +UBOOT_MACHINE = "at91sam9rlek_config" PREFERRED_VERSION_at91bootstrap = "2.10" -- cgit v1.2.3 From 3d378f2464ab6e05ef95e017014328721779bae7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 25 May 2009 16:12:54 +0200 Subject: alsa-lib: add 1.0.20 --- conf/checksums.ini | 4 ++++ recipes/alsa/alsa-lib_1.0.20.bb | 48 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 recipes/alsa/alsa-lib_1.0.20.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index e07f929acd..cd68670adc 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1410,6 +1410,10 @@ sha256=bc691463af8506c1c84db0edab727ee8f8ee4ecd1777b0e264db2525d4500833 md5=de60df7541fafe8c6a3397e0f105ff0e sha256=c487645d32b8124b9ae224b8929e5aa45e581bd8d8c8da666add423cf927d1ea +[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.20.tar.bz2] +md5=6e9080ba1faa5d3739d14dd76c62d8dc +sha256=15f8d0eef1da10c62136107e7b585bc8beb9c9e9b7ad177654097f8c15e57a63 + [ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.11.tar.bz2] md5=3106c2d59a329263867fa3dd44133dda sha256=6b688a3895a14945d0622e16cfdb9292ef9f953ab2d195b08595736f76e5a790 diff --git a/recipes/alsa/alsa-lib_1.0.20.bb b/recipes/alsa/alsa-lib_1.0.20.bb new file mode 100644 index 0000000000..eff114de4b --- /dev/null +++ b/recipes/alsa/alsa-lib_1.0.20.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "Alsa sound library" +HOMEPAGE = "http://www.alsa-project.org" +SECTION = "libs/multimedia" +LICENSE = "LGPL" + +# configure.in sets -D__arm__ on the command line for any arm system +# (not just those with the ARM instruction set), this should be removed, +# (or replaced by a permitted #define). +#FIXME: remove the following +ARM_INSTRUCTION_SET = "arm" + +SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ + file://fix-tstamp-declaration.patch;patch=1 \ + file://fix_libmath.patch;patch=1 \ + " + +inherit autotools pkgconfig + + +EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python" + + +require alsa-fpu.inc +EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} " + + +require alsa-versym.inc +EXTRA_OECONF += "${@get_alsa_versym_setting(bb, d)} " + + +do_stage () { + autotools_stage_all +} + +PACKAGES =+ "alsa-server libasound alsa-conf-base alsa-conf alsa-doc alsa-dev" +FILES_${PN}-dbg += "${libdir}/alsa-lib/*/.debu*" +FILES_libasound = "${libdir}/libasound.so.*" +FILES_alsa-server = "${bindir}/*" +FILES_alsa-conf = "${datadir}/alsa/" +FILES_alsa-dev += "${libdir}/pkgconfig/ /usr/include/ ${datadir}/aclocal/*" +FILES_alsa-conf-base = "\ +${datadir}/alsa/alsa.conf \ +${datadir}/alsa/cards/aliases.conf \ +${datadir}/alsa/pcm/default.conf \ +${datadir}/alsa/pcm/dmix.conf \ +${datadir}/alsa/pcm/dsnoop.conf" + +RDEPENDS_libasound = "alsa-conf-base" -- cgit v1.2.3 From eefaa805730d6b7bbf791864c4fbc3d44135d5a7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 25 May 2009 18:48:17 +0200 Subject: hamlib: add rough version of 1.2.9 --- conf/checksums.ini | 8 ++++++++ recipes/sdr/hamlib_1.2.9.bb | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 recipes/sdr/hamlib_1.2.9.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index cd68670adc..b7e56ba44c 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -10226,6 +10226,14 @@ sha256=80655b3531ea56a5d64085e572dfb8d3ecabffd28af482cd130f72dfdd6254b0 md5=ae7177ab8f0163d3ef2df71f0de2b357 sha256=33dd87dc9452227375b8b9cdad940581714a55d55ff18ae2990905ac2f81fa0f +[http://downloads.sourceforge.net/hamlib/hamlib-1.2.8.tar.gz] +md5=74eaf1be4cf1cbdecee54808c6930788 +sha256=be81153a6e2830234d62818c8aa5658b1410b538a3676686a3f1373f03036b81 + +[http://downloads.sourceforge.net/hamlib/hamlib-1.2.9.tar.gz] +md5=9515288826284d6c8dd569354dacc8e0 +sha256=ba75e64e1b6d5ffaa41e2063e475eca5b35ad68cb4ee6e888e0fc73bd6fa9fba + [http://www.soft.uni-linz.ac.at/~vogl/bluez/handsfree-040326.tar.gz] md5=488b0f2f346361bba7996b459c5d7b6f sha256=dbd0c389a160c9f6dcd9eac81b6c4d5a02866968a33f06201556d6860012f6c3 diff --git a/recipes/sdr/hamlib_1.2.9.bb b/recipes/sdr/hamlib_1.2.9.bb new file mode 100644 index 0000000000..c1406d67e2 --- /dev/null +++ b/recipes/sdr/hamlib_1.2.9.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "The Ham Radio Control Libraries, Hamlib for short, is a development effort to provide a consistent interface for programmers wanting to incorporate radio control in their programs" +LICENSE = "GPLv2" + +DEPENDS = "swig-native python libusb-compat tcl gnuradio" + +SRC_URI = "${SOURCEFORGE_MIRROR}/hamlib/hamlib-${PV}.tar.gz" + +inherit autotools_stage + +# This is a hack, someone with some more time should fix the autofoo +do_configure() { + oe_runconf +} + +PARALLEL_MAKE = "" + +do_compile_prepend() { + mkdir -p ${STAGING_LIBDIR}/.libs + ln -sf ${STAGING_LIBDIR}/libusb* ${STAGING_LIBDIR}/.libs/ +} + +FILES_${PN} = "${bindir} ${sbindir} ${libdir}/hamlib*" + +python populate_packages_prepend () { + cv_libdir = bb.data.expand('${libdir}', d) + cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'hamlib %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'hamlib %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'hamlib %s development package', extra_depends='${PN}-dev') + do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'hamlib %s library', extra_depends='', allow_links=True) +} + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + + -- cgit v1.2.3 From d9d0a81064a71661849cd3cc2d74c925b66a3ac1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 25 May 2009 19:00:49 +0200 Subject: fltk: fix gnu-hash QA error --- recipes/fltk/fltk_1.1.9.bb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/recipes/fltk/fltk_1.1.9.bb b/recipes/fltk/fltk_1.1.9.bb index a2c5dcb5ab..b30da2eeea 100644 --- a/recipes/fltk/fltk_1.1.9.bb +++ b/recipes/fltk/fltk_1.1.9.bb @@ -4,7 +4,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" -PR = "r0" +PR = "r1" SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \ file://disable_test.patch;patch=1 \ @@ -12,7 +12,9 @@ SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fl S = "${WORKDIR}/fltk-${PV}" -inherit lib_package autotools binconfig +inherit lib_package autotools_stage binconfig + +TARGET_CC_ARCH += "${LDFLAGS}" EXTRA_OECONF = "--enable-shared \ --enable-threads \ @@ -23,10 +25,6 @@ do_configure() { oe_runconf } -do_stage() { - autotools_stage_all -} - python populate_packages_prepend () { if (bb.data.getVar('DEBIAN_NAMES', d, 1)): bb.data.setVar('PKG_${PN}', 'libfltk${PV}', d) -- cgit v1.2.3 From 040195458d9594edd1b7f66cee03dbacdcf7b7f5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 25 May 2009 20:40:12 +0200 Subject: hamlib 1.2.9: fix bindings --- recipes/sdr/hamlib_1.2.9.bb | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/recipes/sdr/hamlib_1.2.9.bb b/recipes/sdr/hamlib_1.2.9.bb index c1406d67e2..8815c622e6 100644 --- a/recipes/sdr/hamlib_1.2.9.bb +++ b/recipes/sdr/hamlib_1.2.9.bb @@ -1,12 +1,15 @@ DESCRIPTION = "The Ham Radio Control Libraries, Hamlib for short, is a development effort to provide a consistent interface for programmers wanting to incorporate radio control in their programs" LICENSE = "GPLv2" -DEPENDS = "swig-native python libusb-compat tcl gnuradio" +DEPENDS = "swig-native perl python libusb-compat tcl gnuradio" SRC_URI = "${SOURCEFORGE_MIRROR}/hamlib/hamlib-${PV}.tar.gz" +PR = "r1" + inherit autotools_stage +EXTRA_OECONF = "--with-perl-inc=${STAGING_LIBDIR}/perl/5.8.8/CORE" # This is a hack, someone with some more time should fix the autofoo do_configure() { oe_runconf @@ -17,17 +20,26 @@ PARALLEL_MAKE = "" do_compile_prepend() { mkdir -p ${STAGING_LIBDIR}/.libs ln -sf ${STAGING_LIBDIR}/libusb* ${STAGING_LIBDIR}/.libs/ + for i in $(find ${S} -name "Makefile") ; do + sed -i -e 's:${STAGING_LIBDIR_NATIVE}:${STAGING_LIBDIR}:g' \ + -e s:-L/usr/local/lib::g \ + -e 's:\"$(CC)\":\"${CC}\" LD=\"${LD}\" LDFLAGS=\"${LDFLAGS}\":g' \ + -e s:${STAGING_INCDIR_NATIVE}/python2.6:${STAGING_INCDIR}/python2.6:g $i + done } -FILES_${PN} = "${bindir} ${sbindir} ${libdir}/hamlib*" +# There's one perl module that doesn't honour CFLAGS :( +INSANE_SKIP_${PN} = True +FILES_${PN} = "${bindir} ${sbindir} ${libdir}/hamlib* ${libdir}/p*/ ${libdir}/tcl" +FILES_${PN}-dbg += "${libdir}/perl/*/auto/Hamlib/.debug/" python populate_packages_prepend () { - cv_libdir = bb.data.expand('${libdir}', d) - cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'hamlib %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'hamlib %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'hamlib %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'hamlib %s library', extra_depends='', allow_links=True) + hamlib_libdir = bb.data.expand('${libdir}', d) + hamlib_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, hamlib_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'hamlib %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, hamlib_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'hamlib %s development package', extra_depends='${PN}-dev') + do_split_packages(d, hamlib_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'hamlib %s development package', extra_depends='${PN}-dev') + do_split_packages(d, hamlib_libdir, '^lib(.*)\.so\.*', 'lib%s', 'hamlib %s library', extra_depends='', allow_links=True) } AUTOTOOLS_STAGE_PKGCONFIG = "1" -- cgit v1.2.3 From 454d66a77cac68b0b4a0842f91ded78a0ab9f6d9 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Tue, 26 May 2009 15:40:41 +0100 Subject: alsa-scenario_0.2.bb : add new release of alsa scenario alsa-scenario_git.bb : bump the PV of git recipe, add DEF_PREF = -1 --- conf/checksums.ini | 4 ++++ conf/distro/include/sane-srcrevs.inc | 2 +- recipes/alsa/alsa-scenario_0.2.bb | 14 ++++++++++++++ recipes/alsa/alsa-scenario_git.bb | 6 ++++-- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 recipes/alsa/alsa-scenario_0.2.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index b7e56ba44c..3ee89f1538 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -21130,6 +21130,10 @@ sha256=2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956 md5=953dc98dbd78fba3a80d554514581d26 sha256=0431955a17cd687a28c9b005a6afbc11d8db9348cd4ec91c5600f4f662819e07 +[http://slimlogic.co.uk/pub/downloads/libscenario/scenario-lib-0.2.0.tar.bz2] +md5=18b370f6ff89546df66fe64a2efd676a +sha256=d76d0e8267e781e4ed4a93c9f51b7ae1257bfb2fadb8d8f5b64414b5340b1239 + [http://savannah.nongnu.org/download/scew/scew-0.3.1.tar.gz] md5=e9a69f7014cad332cc78667b07eebbce sha256=0e966359b9e1de31bf375b2a982b7f63cc6dd0c253bda480d1913c668791972a diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 8d2bc93359..4d7c257de2 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -13,7 +13,7 @@ SRCREV_pn-accelges ?= "206" SRCREV_pn-aircrack-ng ?= "802" -SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6" +SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1" SRCREV_pn-app-restarter ?= "4552" SRCREV_pn-assassin ?= "268" SRCREV_pn-assassin-thumbnail ?= "4690" diff --git a/recipes/alsa/alsa-scenario_0.2.bb b/recipes/alsa/alsa-scenario_0.2.bb new file mode 100644 index 0000000000..3b4cf79f93 --- /dev/null +++ b/recipes/alsa/alsa-scenario_0.2.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "ALSA Scenario Library" +HOMEPAGE = "http://opensource.wolfsonmicro.com/node/22" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "alsa-lib ncurses" + +PR = "r0" +PE = "1" + +SRC_URI = "http://slimlogic.co.uk/pub/downloads/libscenario/scenario-lib-0.2.0.tar.bz2" + +S = "${WORKDIR}/scenario-lib-0.2.0" + +inherit autotools diff --git a/recipes/alsa/alsa-scenario_git.bb b/recipes/alsa/alsa-scenario_git.bb index 74c25c247e..edc77d2bbc 100644 --- a/recipes/alsa/alsa-scenario_git.bb +++ b/recipes/alsa/alsa-scenario_git.bb @@ -3,11 +3,13 @@ HOMEPAGE = "http://opensource.wolfsonmicro.com/node/22" SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "alsa-lib ncurses" -PV = "0.1+gitr${SRCREV}" +PV = "0.2+gitr${SRCREV}" PR = "r0" PE = "1" -SRC_URI = "git://opensource.wolfsonmicro.com/alsa-scenario;branch=master;protocol=git" +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "git://slimlogic.co.uk/alsa-scenario;branch=master;protocol=git" S = "${WORKDIR}/git" inherit autotools -- cgit v1.2.3 From e2a27cdd338daeb5b05c6645ecb77feaec04e950 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Tue, 26 May 2009 17:48:08 +0200 Subject: checksums.ini: Cleaned up jamvm entries, added one for 1.5.3. --- conf/checksums.ini | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/conf/checksums.ini b/conf/checksums.ini index 3ee89f1538..627c81e3b8 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -11294,26 +11294,6 @@ sha256=4c4f3c7c479994c3ce09f542d4fbdc03eed58a2d7f320d32f2baf238b5b6f566 md5=b941b8f4de297827f3211c2cb34af199 sha256=79e80af8cbeb68ddad75a1aa6244d7acd62176bfd69bcdc0640d11177dcde97d -[http://downloads.sourceforge.net/jamvm/jamvm-1.3.0.tar.gz] -md5=4f0af6c15f1b9fc50375d30a422bc88f -sha256=445813850236d5ea54942df45046ee9414192b403fb8fb1b8e7cfce0f3ace761 - -[http://downloads.sourceforge.net/jamvm/jamvm-1.3.1.tar.gz] -md5=cceb887aec78fee99773949ede34759e -sha256=3a089c19c49e0e29f319d60afac73708a80a22ac42a9728316193e680f4cec5d - -[http://downloads.sourceforge.net/jamvm/jamvm-1.3.2.tar.gz] -md5=f63b7cf4b541a144c41f17fffb7cc869 -sha256=6740f2cef6a2620bc5959eb65562866ffb5c45050a04555aed244abcbe30f88d - -[http://downloads.sourceforge.net/jamvm/jamvm-1.4.1.tar.gz] -md5=ed79d6b60e50b007614831f8c28321ac -sha256=a73727c9c2e15d6302cf4f5d3aaf8378c5de9d60a302b9d5fa4ee5332341f867 - -[http://downloads.sourceforge.net/jamvm/jamvm-1.4.2.tar.gz] -md5=c7affcc61d4135ee838121a57b08de0f -sha256=dae915b7f963762385df2f4660eaad497261fa72393ba69339530e5b0b5d8bc3 - [http://downloads.sourceforge.net/jamvm/jamvm-1.4.5.tar.gz] md5=3f538bab6e1c77aed331e5e71f754f5b sha256=f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5 @@ -11342,6 +11322,10 @@ sha256=663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a md5=2a564045670b459e9aed857b5f8a3391 sha256=76c976616d344a3b1abd8896be6610c4d97a58af6960e1bc2f442b774bdda839 +[http://downloads.sourceforge.net/jamvm/jamvm-1.5.3.tar.gz] +md5=ce886163658d748113b0570dfae12aea +sha256=f2795ab62635df1c9bc6c4a7b90f53d0d846c0c26f5ec7b352f687506407ebd8 + [http://downloads.sourceforge.net/gakusei/jards_gakusei.cvs.sourceforge.net__20070212.tar.gz] md5=1282913edd226bc9e865f39d79573117 sha256=3c884982ebf40aade899379902ec92c41782d18c19506cf0ec40bcf6a7df8e3b -- cgit v1.2.3 From bca9bd43d90ba0e2b320962ed9cd3e8145c8d745 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Tue, 26 May 2009 17:49:54 +0200 Subject: jamvm-native 1.5.3: New recipe. jamvm-native 1.5.2: Removed. --- recipes/jamvm/jamvm-native_1.5.2.bb | 4 ---- recipes/jamvm/jamvm-native_1.5.3.bb | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 recipes/jamvm/jamvm-native_1.5.2.bb create mode 100644 recipes/jamvm/jamvm-native_1.5.3.bb diff --git a/recipes/jamvm/jamvm-native_1.5.2.bb b/recipes/jamvm/jamvm-native_1.5.2.bb deleted file mode 100644 index e174e2a312..0000000000 --- a/recipes/jamvm/jamvm-native_1.5.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require jamvm-native.inc - -PR = "r0" - diff --git a/recipes/jamvm/jamvm-native_1.5.3.bb b/recipes/jamvm/jamvm-native_1.5.3.bb new file mode 100644 index 0000000000..e174e2a312 --- /dev/null +++ b/recipes/jamvm/jamvm-native_1.5.3.bb @@ -0,0 +1,4 @@ +require jamvm-native.inc + +PR = "r0" + -- cgit v1.2.3 From 685650a1c18e33967c9860ec9f04bff5e6812fb4 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Tue, 26 May 2009 17:51:08 +0200 Subject: jamvm-native 1.5.3: Added note. --- recipes/jamvm/jamvm-native_1.5.3.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/jamvm/jamvm-native_1.5.3.bb b/recipes/jamvm/jamvm-native_1.5.3.bb index e174e2a312..07a213c260 100644 --- a/recipes/jamvm/jamvm-native_1.5.3.bb +++ b/recipes/jamvm/jamvm-native_1.5.3.bb @@ -1,3 +1,5 @@ +# Note: You *must* use this together with classpath-native 0.98. Otherwise it won't work! + require jamvm-native.inc PR = "r0" -- cgit v1.2.3 From 3ac37564039127c80eb5cf109fddf23a8e438bf8 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 26 May 2009 18:58:32 +0000 Subject: e2fsprogs-libs, util-linux-ng, pidgin: Use unique variable names in do_split_packages(): * see http://lists.linuxtogo.org/pipermail/openembedded-devel/2009-May/011212.html for more --- recipes/e2fsprogs-libs/e2fsprogs-libs.inc | 12 ++++++------ recipes/pidgin/pidgin.inc | 8 ++++---- recipes/util-linux-ng/util-linux-ng.inc | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc index 8b214c13bd..5b82c11ca1 100644 --- a/recipes/e2fsprogs-libs/e2fsprogs-libs.inc +++ b/recipes/e2fsprogs-libs/e2fsprogs-libs.inc @@ -15,12 +15,12 @@ FILES_e2fsprogs-libs-dev_append = " ${datadir}/et ${datadir}/ss" FILES_${PN} = "${bindir}" python populate_packages_prepend () { - cv_libdir = bb.data.expand('${libdir}', d) - cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'e2fsprogs-libs %s library', extra_depends='', allow_links=True) + e2fs_libdir = bb.data.expand('${libdir}', d) + e2fs_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, e2fs_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, e2fs_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev') + do_split_packages(d, e2fs_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'e2fsprogs-libs %s development package', extra_depends='${PN}-dev') + do_split_packages(d, e2fs_libdir, '^lib(.*)\.so\.*', 'lib%s', 'e2fsprogs-libs %s library', extra_depends='', allow_links=True) } do_stage () { diff --git a/recipes/pidgin/pidgin.inc b/recipes/pidgin/pidgin.inc index 913cf1c248..7b2f350ce2 100644 --- a/recipes/pidgin/pidgin.inc +++ b/recipes/pidgin/pidgin.inc @@ -52,11 +52,11 @@ FILES_${PN}-dev += "${libdir}/${PN}/*.la" PACKAGES_DYNAMIC = "libpurple-protocol-* libpurple-plugin-* pidgin-plugin-* finch-plugin-*" python populate_packages_prepend () { - root = bb.data.expand('${libdir}/pidgin', d) - purple = bb.data.expand('${libdir}/purple-2', d) - finch = bb.data.expand('${libdir}/finch', d) + pidgroot = bb.data.expand('${libdir}/pidgin', d) + purple = bb.data.expand('${libdir}/purple-2', d) + finch = bb.data.expand('${libdir}/finch', d) - do_split_packages(d, root, '^([^l][^i][^b].*)\.so$', + do_split_packages(d, pidgroot, '^([^l][^i][^b].*)\.so$', output_pattern='pidgin-plugin-%s', description='Pidgin plugin %s', prepend=True, extra_depends='') diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index 45fd1a6048..9c70b9e3ff 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -123,12 +123,12 @@ do_install () { } python populate_packages_prepend () { - cv_libdir = bb.data.expand('${libdir}', d) - cv_libdir_dbg = bb.data.expand('${libdir}/.debug', d) - do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev', allow_links=True) - do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev') - do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'util-linux-ng %s library', extra_depends='', allow_links=True) + ulinxng_libdir = bb.data.expand('${libdir}', d) + ulinxng_libdir_dbg = bb.data.expand('${libdir}/.debug', d) + do_split_packages(d, ulinxng_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev', allow_links=True) + do_split_packages(d, ulinxng_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev') + do_split_packages(d, ulinxng_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'util-linux-ng %s development package', extra_depends='${PN}-dev') + do_split_packages(d, ulinxng_libdir, '^lib(.*)\.so\.*', 'lib%s', 'util-linux-ng %s library', extra_depends='', allow_links=True) } -- cgit v1.2.3 From 09e27e7990ab6e72cd117eb9f2f6184ae2f7edbe Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 26 May 2009 19:03:43 +0000 Subject: flac: Fixed build. Added printf format fix. --- recipes/flac/files/flac-gcc43-fixes.diff | 10 ++++++ recipes/flac/files/flac-printf-format-fix.diff | 43 ++++++++++++++++++++++++++ recipes/flac/flac_1.2.1.bb | 6 +++- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 recipes/flac/files/flac-gcc43-fixes.diff create mode 100644 recipes/flac/files/flac-printf-format-fix.diff diff --git a/recipes/flac/files/flac-gcc43-fixes.diff b/recipes/flac/files/flac-gcc43-fixes.diff new file mode 100644 index 0000000000..8d41490975 --- /dev/null +++ b/recipes/flac/files/flac-gcc43-fixes.diff @@ -0,0 +1,10 @@ +--- examples/cpp/encode/file/main.cpp-dist 2007-10-22 15:14:12.000000000 +0200 ++++ examples/cpp/encode/file/main.cpp 2007-10-22 15:14:41.000000000 +0200 +@@ -30,6 +30,7 @@ + + #include + #include ++#include + #include "FLAC++/metadata.h" + #include "FLAC++/encoder.h" + diff --git a/recipes/flac/files/flac-printf-format-fix.diff b/recipes/flac/files/flac-printf-format-fix.diff new file mode 100644 index 0000000000..2296cdbe91 --- /dev/null +++ b/recipes/flac/files/flac-printf-format-fix.diff @@ -0,0 +1,43 @@ +--- src/test_grabbag/cuesheet/main.c-dist 2007-04-10 19:14:42.000000000 +0200 ++++ src/test_grabbag/cuesheet/main.c 2007-04-10 19:15:33.000000000 +0200 +@@ -115,12 +115,12 @@ int main(int argc, char *argv[]) + const char *usage = "usage: test_cuesheet cuesheet_file lead_out_offset [ cdda ]\n"; + + if(argc > 1 && 0 == strcmp(argv[1], "-h")) { +- printf(usage); ++ fputs(usage, stdout); + return 0; + } + + if(argc < 3 || argc > 4) { +- fprintf(stderr, usage); ++ fputs(usage, stderr); + return 255; + } + +@@ -129,7 +129,7 @@ int main(int argc, char *argv[]) + if(0 == strcmp(argv[3], "cdda")) + is_cdda = true; + else { +- fprintf(stderr, usage); ++ fputs(usage, stderr); + return 255; + } + } +--- src/test_grabbag/picture/main.c-dist 2007-04-10 19:15:47.000000000 +0200 ++++ src/test_grabbag/picture/main.c 2007-04-10 19:16:02.000000000 +0200 +@@ -211,12 +211,12 @@ int main(int argc, char *argv[]) + const char *usage = "usage: test_pictures path_prefix\n"; + + if(argc > 1 && 0 == strcmp(argv[1], "-h")) { +- printf(usage); ++ fputs(usage, stdout); + return 0; + } + + if(argc != 2) { +- fprintf(stderr, usage); ++ fputs(usage, stderr); + return 255; + } + diff --git a/recipes/flac/flac_1.2.1.bb b/recipes/flac/flac_1.2.1.bb index 94f24fc169..eea1cbb9a5 100644 --- a/recipes/flac/flac_1.2.1.bb +++ b/recipes/flac/flac_1.2.1.bb @@ -1,3 +1,7 @@ require flac.inc -PR = "r0" +PR = "r1" + +# fixes from openSUSE: +SRC_URI += "file://flac-gcc43-fixes.diff;patch=1;pnum=0 \ + file://flac-printf-format-fix.diff;patch=1;pnum=0" -- cgit v1.2.3 From 11af43ab7498f86026004daeca86fdde8f1ae0b6 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 26 May 2009 19:07:17 +0000 Subject: kismet: Fixed build. --- recipes/kismet/kismet-2007-10-R1/string_h.patch | 36 +++++++++++++++++++++++++ recipes/kismet/kismet_2007-10-R1.bb | 3 ++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 recipes/kismet/kismet-2007-10-R1/string_h.patch diff --git a/recipes/kismet/kismet-2007-10-R1/string_h.patch b/recipes/kismet/kismet-2007-10-R1/string_h.patch new file mode 100644 index 0000000000..363664fb6f --- /dev/null +++ b/recipes/kismet/kismet-2007-10-R1/string_h.patch @@ -0,0 +1,36 @@ +Index: kismet-2007-10-R1/kismet_wrapper.cc +=================================================================== +--- kismet-2007-10-R1.orig/kismet_wrapper.cc 2007-10-06 21:50:03.000000000 +0000 ++++ kismet-2007-10-R1/kismet_wrapper.cc 2009-05-26 12:58:01.000000000 +0000 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include "config.h" + +Index: kismet-2007-10-R1/ringbuf.cc +=================================================================== +--- kismet-2007-10-R1.orig/ringbuf.cc 2005-12-11 19:14:39.000000000 +0000 ++++ kismet-2007-10-R1/ringbuf.cc 2009-05-26 12:56:17.000000000 +0000 +@@ -17,6 +17,7 @@ + */ + + #include "ringbuf.h" ++#include + + RingBuffer::RingBuffer(int in_size) { + ring_len = in_size; +Index: kismet-2007-10-R1/util.cc +=================================================================== +--- kismet-2007-10-R1.orig/util.cc 2006-08-28 20:37:29.000000000 +0000 ++++ kismet-2007-10-R1/util.cc 2009-05-26 12:57:00.000000000 +0000 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + // We need this to make uclibc happy since they don't even have rintf... + #ifndef rintf diff --git a/recipes/kismet/kismet_2007-10-R1.bb b/recipes/kismet/kismet_2007-10-R1.bb index 4786543ec8..ac3c56f156 100644 --- a/recipes/kismet/kismet_2007-10-R1.bb +++ b/recipes/kismet/kismet_2007-10-R1.bb @@ -1,5 +1,6 @@ require kismet.inc -SRC_URI += "file://fix_strip.patch;patch=1" +SRC_URI += "file://fix_strip.patch;patch=1 \ + file://string_h.patch;patch=1" PR = "r5" -- cgit v1.2.3 From d630bf6330993ada782a1bd856da22c78516a1d5 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 26 May 2009 19:16:12 +0000 Subject: kismet: Update to version 2008-05-R1. --- conf/checksums.ini | 4 ++ recipes/kismet/files/fix_strip.patch | 47 ++++++++++++++++++++++ recipes/kismet/kismet-2007-10-R1/fix_strip.patch | 47 ---------------------- .../kismet-2008-05-R1/kismet-2008-05-R1-crash.diff | 20 +++++++++ .../kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff | 11 +++++ .../kismet-2008-05-R1-infinite-loop.diff | 20 +++++++++ .../kismet-2008-05-R1-nonvoid.diff | 10 +++++ recipes/kismet/kismet_2008-05-R1.bb | 10 +++++ 8 files changed, 122 insertions(+), 47 deletions(-) create mode 100644 recipes/kismet/files/fix_strip.patch delete mode 100644 recipes/kismet/kismet-2007-10-R1/fix_strip.patch create mode 100644 recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-crash.diff create mode 100644 recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff create mode 100644 recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-infinite-loop.diff create mode 100644 recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-nonvoid.diff create mode 100644 recipes/kismet/kismet_2008-05-R1.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 627c81e3b8..01828706f1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -11634,6 +11634,10 @@ sha256=1b998b34e2e9377f5ac7704295d64507234fe7656e49d384f8bf95604e97e05b md5=2100c667e69db0cde35fa2d06c8516e2 sha256=023e7f47039c1ad8615052e464f76a3cd496a423449b931036d127c56d58b2b9 +[http://www.kismetwireless.net/code/kismet-2008-05-R1.tar.gz] +md5=6ee365d36354b4dee4945e67f8149294 +sha256=a298d44f8a6ec977021cd492a720987ded81b5c4baf5f68b36f1282a23c9f7d3 + [http://kernel.org//pub/linux/libs/klibc/Stable/klibc-0.190.tar.bz2] md5=6c96f954676c7b898dfe230e0f2a1fb5 sha256=5767cbb094300c5e26eb0bab588ecdbf9e5db2a637e9ae73c2efb8a62e05217e diff --git a/recipes/kismet/files/fix_strip.patch b/recipes/kismet/files/fix_strip.patch new file mode 100644 index 0000000000..54e7a9b1b7 --- /dev/null +++ b/recipes/kismet/files/fix_strip.patch @@ -0,0 +1,47 @@ +Index: kismet-2007-10-R1/Makefile.in +=================================================================== +--- kismet-2007-10-R1.orig/Makefile.in 2008-03-06 15:20:37.000000000 +0000 ++++ kismet-2007-10-R1/Makefile.in 2008-03-06 15:21:07.000000000 +0000 +@@ -138,23 +138,23 @@ + fi + + binuserinstall: +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS); +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE); ++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS); ++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE); + + binsuidinstall: +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE); ++ install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(PS) $(BIN)/$(PS); ++ install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(DRONE) $(BIN)/$(DRONE); + + commoninstall: + mkdir -p $(ETC) + mkdir -p $(BIN) + + install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(WRAP) $(BIN)/kismet +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC) +- # install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER) ++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC) ++ # install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(HOPPER) $(BIN)/$(HOPPER) + @if test "$(ZAURUS)" = "yes"; then \ +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \ ++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \ ++ echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \ + fi + #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor + #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor +@@ -169,8 +169,8 @@ + install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5 + + @if test "$(GPSLBUILD)" = "$(GPSL)"; then \ +- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \ +- echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \ ++ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \ ++ echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \ + install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ + echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ + install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ diff --git a/recipes/kismet/kismet-2007-10-R1/fix_strip.patch b/recipes/kismet/kismet-2007-10-R1/fix_strip.patch deleted file mode 100644 index 54e7a9b1b7..0000000000 --- a/recipes/kismet/kismet-2007-10-R1/fix_strip.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: kismet-2007-10-R1/Makefile.in -=================================================================== ---- kismet-2007-10-R1.orig/Makefile.in 2008-03-06 15:20:37.000000000 +0000 -+++ kismet-2007-10-R1/Makefile.in 2008-03-06 15:21:07.000000000 +0000 -@@ -138,23 +138,23 @@ - fi - - binuserinstall: -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS); -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE); -+ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS); -+ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE); - - binsuidinstall: -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE); -+ install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(PS) $(BIN)/$(PS); -+ install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(DRONE) $(BIN)/$(DRONE); - - commoninstall: - mkdir -p $(ETC) - mkdir -p $(BIN) - - install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(WRAP) $(BIN)/kismet -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC) -- # install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER) -+ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC) -+ # install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(HOPPER) $(BIN)/$(HOPPER) - @if test "$(ZAURUS)" = "yes"; then \ -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \ -- echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \ -+ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \ -+ echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \ - fi - #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor - #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor -@@ -169,8 +169,8 @@ - install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5 - - @if test "$(GPSLBUILD)" = "$(GPSL)"; then \ -- install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \ -- echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \ -+ install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \ -+ echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \ - install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ - echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \ - install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \ diff --git a/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-crash.diff b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-crash.diff new file mode 100644 index 0000000000..4c1d3a2360 --- /dev/null +++ b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-crash.diff @@ -0,0 +1,20 @@ +--- kismet_wrapper.cc ++++ kismet_wrapper.cc +@@ -79,7 +79,7 @@ void reap(int sig) { + if (FD_ISSET(epipe[0], &rset)) { + if (fgets(ret, 2048, err) == NULL || + feof(err)) { +- if (feof(out)) ++ if (!check_out || feof(out)) + break; + + fclose(err); +@@ -98,7 +98,7 @@ void reap(int sig) { + if (FD_ISSET(rpipe[0], &rset)) { + if (fgets(ret, 2048, out) == NULL || + feof(out)) { +- if (feof(err)) ++ if (!check_err || feof(err)) + break; + + fclose(out); diff --git a/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff new file mode 100644 index 0000000000..032f92ba22 --- /dev/null +++ b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-fmt.diff @@ -0,0 +1,11 @@ +--- gpsmap.cc ++++ gpsmap.cc +@@ -3825,7 +3825,7 @@ + else if (tok == "location") + network_labels.push_back(NETLABEL_LOCATION); + else { +- fprintf(stderr, "Invalid label '%s'\n", tok.c_str()); ++ fprintf(stderr, "Invalid label '%zs'\n", tok.c_str()); + exit(1); + } + } diff --git a/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-infinite-loop.diff b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-infinite-loop.diff new file mode 100644 index 0000000000..f8417943e8 --- /dev/null +++ b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-infinite-loop.diff @@ -0,0 +1,20 @@ +--- gpsmap.cc ++++ gpsmap.cc +@@ -874,7 +874,7 @@ + + // Break up the path to the gpsxml file and form a path based on that + unsigned int lastslash = 0; +- for (unsigned int x = origxmlfile.find('/'); x != string::npos; ++ for (string::size_type x = origxmlfile.find('/'); x != string::npos; + lastslash = x, x = origxmlfile.find('/', lastslash+1)) { + // We don't actually need to do anything... + } +@@ -882,7 +882,7 @@ + comp = origxmlfile.substr(0, lastslash); + + lastslash = 0; +- for (unsigned int x = orignetfile.find('/'); x != string::npos; ++ for (string::size_type x = orignetfile.find('/'); x != string::npos; + lastslash = x, x = orignetfile.find('/', lastslash+1)) { + // We don't actually need to do anything... + } diff --git a/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-nonvoid.diff b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-nonvoid.diff new file mode 100644 index 0000000000..e068f8dac5 --- /dev/null +++ b/recipes/kismet/kismet-2008-05-R1/kismet-2008-05-R1-nonvoid.diff @@ -0,0 +1,10 @@ +--- pcapsource.cc ++++ pcapsource.cc +@@ -2914,6 +2914,7 @@ + return -1; + + } ++ return -1; + } + #endif + diff --git a/recipes/kismet/kismet_2008-05-R1.bb b/recipes/kismet/kismet_2008-05-R1.bb new file mode 100644 index 0000000000..c413ed508a --- /dev/null +++ b/recipes/kismet/kismet_2008-05-R1.bb @@ -0,0 +1,10 @@ +require kismet.inc + +# patches *.diff are from openSUSE +SRC_URI += "file://kismet-2008-05-R1-crash.diff;patch=1;pnum=0 \ + file://kismet-2008-05-R1-fmt.diff;patch=1;pnum=0 \ + file://kismet-2008-05-R1-infinite-loop.diff;patch=1;pnum=0 \ + file://kismet-2008-05-R1-nonvoid.diff;patch=1;pnum=0 \ + file://fix_strip.patch;patch=1" + +PR = "r0" -- cgit v1.2.3 From 31d61332a420537ee647427b980d054a2f55e453 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 26 May 2009 19:31:11 +0000 Subject: totem-pl-parser: Updated to version 2.26.2. --- conf/checksums.ini | 4 ++++ recipes/totem/totem-pl-parser_2.26.2.bb | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 recipes/totem/totem-pl-parser_2.26.2.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 01828706f1..eea1240e83 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -22986,6 +22986,10 @@ sha256=5730611c42f8a8540343faa9512d9161073d2f882668c80dd0cf6a34c72daa75 md5=fa658ae2f20458d3c5d3effba3b2dd7e sha256=3193c3446d211db2bd3c169c86f6d433666669336bd589a20c87f1483295cf2a +[http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.26/totem-pl-parser-2.26.2.tar.bz2] +md5=daffda80cfead2a1473ca3ff71e1057b +sha256=3a6dd0382fe074f23a747b08423fccb23fb38c25b1feddacbd4875d8b8c83743 + [http://www.gnome.org/~jamiemcc/tracker/tracker-0.5.4.tar.gz] md5=724208e1b2d235148499672b44181298 sha256=ad214a2692041f423d2150777c233b21cab2d108f849edc513192587ac63c9c2 diff --git a/recipes/totem/totem-pl-parser_2.26.2.bb b/recipes/totem/totem-pl-parser_2.26.2.bb new file mode 100644 index 0000000000..f9694b05d8 --- /dev/null +++ b/recipes/totem/totem-pl-parser_2.26.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Playlist parser for Totem, a GTK2 based media player" +HOMEPAGE = "http://www.gnome.org/projects/totem/" +LICENSE = "GPL" + +DEPENDS = "eds-dbus" + +inherit gnome + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} + +# Build of documentation is not yet possible: +do_configure_prepend() { + sed -i -e s:docs::g ${S}/Makefile.am +} -- cgit v1.2.3 From b9254b786f77ca7455c36d705abc5b2d6d27aece Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 26 May 2009 19:33:31 +0000 Subject: libmusicbrainz: Fixed build. --- .../files/libmusicbrainz-2.1.5-gcc43.patch | 58 ++++++++++++++++++++++ recipes/musicbrainz/libmusicbrainz_2.1.5.bb | 4 +- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 recipes/musicbrainz/files/libmusicbrainz-2.1.5-gcc43.patch diff --git a/recipes/musicbrainz/files/libmusicbrainz-2.1.5-gcc43.patch b/recipes/musicbrainz/files/libmusicbrainz-2.1.5-gcc43.patch new file mode 100644 index 0000000000..c9685301b4 --- /dev/null +++ b/recipes/musicbrainz/files/libmusicbrainz-2.1.5-gcc43.patch @@ -0,0 +1,58 @@ +diff -Naur libmusicbrainz-2.1.5.org/lib/comhttpsocket.cpp libmusicbrainz-2.1.5/lib/comhttpsocket.cpp +--- libmusicbrainz-2.1.5.org/lib/comhttpsocket.cpp 2008-01-07 11:36:10.105820000 +0100 ++++ libmusicbrainz-2.1.5/lib/comhttpsocket.cpp 2008-01-07 11:38:45.794974000 +0100 +@@ -20,6 +20,7 @@ + #endif + #include + #include ++#include + + const char* g_strCOMVer = "libmusicbrainz/"VERSION; + +diff -Naur libmusicbrainz-2.1.5.org/lib/comsocket.cpp libmusicbrainz-2.1.5/lib/comsocket.cpp +--- libmusicbrainz-2.1.5.org/lib/comsocket.cpp 2008-01-07 11:36:10.145783000 +0100 ++++ libmusicbrainz-2.1.5/lib/comsocket.cpp 2008-01-07 11:44:12.604854000 +0100 +@@ -34,6 +34,7 @@ + #include "comsocket.h" + #ifndef WIN32 + ++#include + #include + #include + #include +diff -Naur libmusicbrainz-2.1.5.org/lib/c_wrapper.cpp libmusicbrainz-2.1.5/lib/c_wrapper.cpp +--- libmusicbrainz-2.1.5.org/lib/c_wrapper.cpp 2008-01-07 11:36:10.083846000 +0100 ++++ libmusicbrainz-2.1.5/lib/c_wrapper.cpp 2008-01-07 11:41:45.093496000 +0100 +@@ -21,6 +21,7 @@ + $Id: c_wrapper.cpp 665 2003-10-16 22:21:10Z robert $ + + ----------------------------------------------------------------------------*/ ++#include + #include "musicbrainz.h" + #include "trm.h" + #include "mb_c.h" +diff -Naur libmusicbrainz-2.1.5.org/lib/http.cpp libmusicbrainz-2.1.5/lib/http.cpp +--- libmusicbrainz-2.1.5.org/lib/http.cpp 2008-01-07 11:36:10.210725000 +0100 ++++ libmusicbrainz-2.1.5/lib/http.cpp 2008-01-07 11:46:38.053245000 +0100 +@@ -23,7 +23,8 @@ + + ----------------------------------------------------------------------------*/ + #include +-#include ++#include ++#include + #include + #include + #include +diff -Naur libmusicbrainz-2.1.5.org/lib/sigclient.cpp libmusicbrainz-2.1.5/lib/sigclient.cpp +--- libmusicbrainz-2.1.5.org/lib/sigclient.cpp 2008-01-07 11:36:10.338589000 +0100 ++++ libmusicbrainz-2.1.5/lib/sigclient.cpp 2008-01-07 11:48:42.883323000 +0100 +@@ -33,6 +33,8 @@ + #pragma warning(disable:4786) + #endif + ++#include ++ + #include "sigclient.h" + #include "comhttpsocket.h" + diff --git a/recipes/musicbrainz/libmusicbrainz_2.1.5.bb b/recipes/musicbrainz/libmusicbrainz_2.1.5.bb index 7ab0997218..452e874e1f 100644 --- a/recipes/musicbrainz/libmusicbrainz_2.1.5.bb +++ b/recipes/musicbrainz/libmusicbrainz_2.1.5.bb @@ -4,7 +4,9 @@ HOMEPAGE = "http://musicbrainz.org" LICENSE = "LGPL" DEPENDS = "expat" -SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz" +# gcc43.patch from openSUSE +SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz \ + file://libmusicbrainz-2.1.5-gcc43.patch;patch=1" inherit autotools pkgconfig -- cgit v1.2.3 From ae6e3f520b01f3be3b6f31a68763dc3734d00ce1 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 26 May 2009 19:38:19 +0000 Subject: rhythmbox: Updated to version 0.12.1, removed unbuildable versions. --- conf/checksums.ini | 4 + recipes/rhythmbox/rhythmbox/ogg.m4 | 102 ------------------------- recipes/rhythmbox/rhythmbox/omfmake.patch | 13 ---- recipes/rhythmbox/rhythmbox/vorbis.m4 | 122 ------------------------------ recipes/rhythmbox/rhythmbox_0.12.1.bb | 26 +++++++ recipes/rhythmbox/rhythmbox_0.8.5.bb | 29 ------- recipes/rhythmbox/rhythmbox_0.8.7.bb | 28 ------- 7 files changed, 30 insertions(+), 294 deletions(-) delete mode 100644 recipes/rhythmbox/rhythmbox/ogg.m4 delete mode 100644 recipes/rhythmbox/rhythmbox/omfmake.patch delete mode 100644 recipes/rhythmbox/rhythmbox/vorbis.m4 create mode 100644 recipes/rhythmbox/rhythmbox_0.12.1.bb delete mode 100644 recipes/rhythmbox/rhythmbox_0.8.5.bb delete mode 100644 recipes/rhythmbox/rhythmbox_0.8.7.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index eea1240e83..b6c1357c13 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -20730,6 +20730,10 @@ sha256=13cce714959056d41627ec9442342d46072f9d72ef57554b9d03ebfb353ed2d1 md5=613eed8201d37be201805e5048ebb0c3 sha256=084e250d2392369b2548b663e61bcf128baecb2f527e381e9ba89f0148db2c0d +[http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.12/rhythmbox-0.12.1.tar.bz2] +md5=f17a72465dc43d554b11cf7b18776bff +sha256=1f444b9cd74615831dab7ec8cd3c58c95d7436372df9a768bd701ab4321a8721 + [http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-0.8.5.tar.gz] md5=5ac4e1b5ff4f2fdada81c007ac599cb9 sha256=654d6b190f4644d82c10b4ce5645b72405c2e78ea346ce3d8eb385fc3f3732de diff --git a/recipes/rhythmbox/rhythmbox/ogg.m4 b/recipes/rhythmbox/rhythmbox/ogg.m4 deleted file mode 100644 index 1f643f1204..0000000000 --- a/recipes/rhythmbox/rhythmbox/ogg.m4 +++ /dev/null @@ -1,102 +0,0 @@ -# Configure paths for libogg -# Jack Moffitt 10-21-2000 -# Shamelessly stolen from Owen Taylor and Manish Singh -define(arch-tag) -# arch-tag: Autoconf macro for checking libogg - -dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS -dnl -AC_DEFUN(MM_PATH_OGG, -[dnl -dnl Get the cflags and libraries -dnl -AC_ARG_WITH(ogg,[ --with-ogg=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="") -AC_ARG_WITH(ogg-libraries,[ --with-ogg-libraries=DIR Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="") -AC_ARG_WITH(ogg-includes,[ --with-ogg-includes=DIR Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="") -AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes) - - if test "x$ogg_libraries" != "x" ; then - OGG_LIBS="-L$ogg_libraries" - elif test "x$ogg_prefix" != "x" ; then - OGG_LIBS="-L$ogg_prefix/lib" - elif test "x$prefix" != "xNONE" ; then - OGG_LIBS="-L$prefix/lib" - fi - - OGG_LIBS="$OGG_LIBS -logg" - - if test "x$ogg_includes" != "x" ; then - OGG_CFLAGS="-I$ogg_includes" - elif test "x$ogg_prefix" != "x" ; then - OGG_CFLAGS="-I$ogg_prefix/include" - fi - - AC_MSG_CHECKING(for Ogg) - no_ogg="" - - - if test "x$enable_oggtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $OGG_CFLAGS" - LIBS="$LIBS $OGG_LIBS" -dnl -dnl Now