From f546c09c462c8f0803f24c4ed0d3ff92d1fa25b1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 26 Jun 2006 12:03:55 +0000 Subject: nunome: RDEPEND on virtual/japanese-font --- packages/nunome/nunome_1.0.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/nunome/nunome_1.0.1.bb b/packages/nunome/nunome_1.0.1.bb index 51ab8cee83..d3af648813 100644 --- a/packages/nunome/nunome_1.0.1.bb +++ b/packages/nunome/nunome_1.0.1.bb @@ -3,8 +3,8 @@ SECTION = "opie/inputmethods" PRIORITY = "optional" LICENSE = "GPL" HOMEPAGE = "http://www.sikigami.com/nunome-Qtopia-1.0/" -RDEPENDS = "font-ttf-japanese" -PR = "r0" +RDEPENDS = "virtual/japanese-font" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/nunome-Qtopia-src-cleaned.tar.bz2 \ file://nunome.patch;patch=1" -- cgit v1.2.3 From 3937415bfb927b39c221c72aba619cb463a68a1b Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 26 Jun 2006 13:19:25 +0000 Subject: openldap: SCR_URI -> SRC_URI and removed superfluous ; --- packages/openldap/openldap_2.3.11.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/openldap/openldap_2.3.11.bb b/packages/openldap/openldap_2.3.11.bb index 4a80b3e1b6..70e6547146 100644 --- a/packages/openldap/openldap_2.3.11.bb +++ b/packages/openldap/openldap_2.3.11.bb @@ -12,13 +12,13 @@ PRIORITY = "optional" LICENSE = "OpenLDAP" SECTION = "libs" -PR = "r3" +PR = "r4" LDAP_VER = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}" SRC_URI = "ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${P}.tgz" SRC_URI += "file://openldap-m4-pthread.patch;patch=1" -SCR_URI += "file://initscript"; +SRC_URI += "file://initscript" # The build tries to run a host executable, this fails. The patch # causes the executable and its data to be installed instead of # the output - ucgendat must be run after the ipkg install! -- cgit v1.2.3 From 718132a222683ff8768760bb94a87fa458b77d8b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 26 Jun 2006 13:30:43 +0000 Subject: openobex: fix DEPENDS, fix EXTRA_OECONF. This should close #1113 --- packages/openobex/openobex_1.2.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/openobex/openobex_1.2.bb b/packages/openobex/openobex_1.2.bb index 97f030d3e2..feceb39bce 100644 --- a/packages/openobex/openobex_1.2.bb +++ b/packages/openobex/openobex_1.2.bb @@ -1,11 +1,11 @@ -DESCRIPTION = "The Openobex project aims to make an \ -open source implementation of the Object Exchange \ -(OBEX) protocol." +DESCRIPTION = "The Openobex project is an open source implementation of the \ +Object Exchange (OBEX) protocol." HOMEPAGE = "http://openobex.triq.net" SECTION = "libs" PROVIDES = "openobex-apps" +DEPENDS = "libusb bluez-libs" LICENSE = "GPL" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ file://disable-cable-test.patch;patch=1" \ @@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz \ inherit autotools binconfig pkgconfig EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \ - --with-usb=${STAGING_DIR} --with-bluez=${STAGING_DIR}" + --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.." do_stage() { oe_libinstall -so -C lib libopenobex ${STAGING_LIBDIR} -- cgit v1.2.3 From 9d94852806f30b4393be3cba6e0b7f0d795db48b Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 26 Jun 2006 14:08:26 +0000 Subject: pvrusb2-mci: added 20060626 snapshot, also added some missing RRECOMMENDS --- .../pvrusb2-mci-20060626/.mtn2git_empty | 0 .../pvrusb2-mci-20060626/Makefile.patch | 25 +++++++++++++ packages/pvrusb2-mci/pvrusb2-mci_20060626.bb | 43 ++++++++++++++++++++++ 3 files changed, 68 insertions(+) create mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060626/.mtn2git_empty create mode 100644 packages/pvrusb2-mci/pvrusb2-mci-20060626/Makefile.patch create mode 100644 packages/pvrusb2-mci/pvrusb2-mci_20060626.bb (limited to 'packages') diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060626/.mtn2git_empty b/packages/pvrusb2-mci/pvrusb2-mci-20060626/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/pvrusb2-mci/pvrusb2-mci-20060626/Makefile.patch b/packages/pvrusb2-mci/pvrusb2-mci-20060626/Makefile.patch new file mode 100644 index 0000000000..3db0b2c9d6 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci-20060626/Makefile.patch @@ -0,0 +1,25 @@ +*** driver/Makefile.orig 2006-04-02 03:40:31.000000000 +0200 +--- driver/Makefile 2006-04-26 21:56:46.000000000 +0200 +*************** +*** 57,66 **** + CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) M=$(M) $(CONFIG_VARS) modules_install + + else + +--- 57,66 ---- + CONFIG_VARS+= CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y + + modules modules_install clean: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) $@ + + install: +! $(MAKE) INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) -C $(KDIR) CFLAGS="$(CFLAGS)" M=$(M) $(CONFIG_VARS) modules_install + + else + diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb new file mode 100644 index 0000000000..22823d43c4 --- /dev/null +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "Driver for the Hauppauge WinTV PVR USB2" +HOMEPAGE = "http://www.isely.net/pvrusb2.html" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "eFfeM " +LICENSE = "GPL" +PR = "r0" +RRECOMMENDS = "kernel-module-tveeprom \ + kernel-module-firmware-class \ + kernel-module-tuner \ + kernel-module-msp3400 \ + kernel-module-saa7115 \ + kernel-module-tda9887 \ + kernel-module-v4l1-compat \ + kernel-module-v4l2-common \ + kernel-module-videodev" + +SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ + file://Makefile.patch;patch=1" + +S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" + +inherit module + +CFLAGS = "'-I${KERNEL_SOURCE}/include' \ + '-I${KERNEL_SOURCE}/drivers/media/video' " + +CFLAGS_append_arm = " '-D__LINUX_ARM_ARCH__=5' " + +CFLAGS_append_armeb = " '-D__LINUX_ARM_ARCH__=5' " + +EXTRA_OEMAKE = "'V=1' 'CFLAGS=${CFLAGS}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' \ + 'KDIR=${STAGING_KERNEL_DIR}'" + +export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ + -Wl,-rpath-link,${STAGING_DIR}/${TARGET_SYS}/lib" + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media +} -- cgit v1.2.3 From e9e6594dd9f2724d2819111657593b53d47184c1 Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 26 Jun 2006 14:24:27 +0000 Subject: pvrusb2-mci: added hotplug scripts --- packages/pvrusb2-mci/pvrusb2-mci_20060626.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb index 22823d43c4..ab22c521f3 100644 --- a/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb +++ b/packages/pvrusb2-mci/pvrusb2-mci_20060626.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" SECTION = "kernel/modules" MAINTAINER = "eFfeM " LICENSE = "GPL" -PR = "r0" +PR = "r1" RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-firmware-class \ kernel-module-tuner \ @@ -16,6 +16,8 @@ RRECOMMENDS = "kernel-module-tveeprom \ kernel-module-videodev" SRC_URI = "http://www.isely.net/downloads/pvrusb2-mci-${PV}.tar.bz2 \ + file://hotplug.functions \ + file://firmware.hotplug \ file://Makefile.patch;patch=1" S = "${WORKDIR}/pvrusb2-mci-${PV}/driver" @@ -40,4 +42,7 @@ export TARGET_LDFLAGS = "-L${STAGING_DIR}/${TARGET_SYS}/lib \ do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + mkdir -p ${D}/etc/hotplug.d/firmware + cp ${WORKDIR}/hotplug.functions ${D}/etc/hotplug.d/firmware + cp ${WORKDIR}/firmware.hotplug ${D}/etc/hotplug.d/firmware } -- cgit v1.2.3 From ae97afb76ee84ae1b16d68c71f23a171fd2e5c7a Mon Sep 17 00:00:00 2001 From: Frans Meulenbroeks Date: Mon, 26 Jun 2006 15:24:13 +0000 Subject: zd1211: bumped PR to force rebuilding for 2.6.17 --- packages/zd1211/zd1211_r77.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/zd1211/zd1211_r77.bb b/packages/zd1211/zd1211_r77.bb index 398d516372..2e4297308e 100644 --- a/packages/zd1211/zd1211_r77.bb +++ b/packages/zd1211/zd1211_r77.bb @@ -3,7 +3,7 @@ PRIORITY = "optional" SECTION = "kernel/modules" MAINTAINER = "Oyvind Repvik " LICENSE = "GPL" -PR = "r1" +PR = "r2" RDEPENDS = "wireless-tools" SRC_URI = "http://zd1211.ath.cx/download/zd1211-driver-${PV}.tgz \ -- cgit v1.2.3 From 223e09827f3e895bbe9ebae5084c19533a0869f8 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 26 Jun 2006 17:08:37 +0000 Subject: obexpush: supply -Wl,-rpath to STAGING_LIBDIR --- packages/obexpush/obexpush_1.0.0.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/obexpush/obexpush_1.0.0.bb b/packages/obexpush/obexpush_1.0.0.bb index a01b6ddee6..4ec591d262 100644 --- a/packages/obexpush/obexpush_1.0.0.bb +++ b/packages/obexpush/obexpush_1.0.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.caside.lancs.ac.uk/java_bt.php" SECTION = "console/network" LICENSE = "GPL" DEPENDS = "glib-2.0 openobex bluez-libs" -PR = "r2" +PR = "r3" SRC_URI = "http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz \ file://add-obextool.patch;patch=1 \ @@ -15,10 +15,10 @@ inherit update-rc.d INITSCRIPT_NAME = "opd" INITSCRIPT_PARAMS = "defaults 33 09" -export GLIBINC=-I${STAGING_INCDIR}/glib-2.0 -export GLIBLIB=-I${STAGING_LIBDIR} -lglib-2.0 -export OBEXINC=-I${STAGING_INCDIR} -export OBEXLIB=-L${STAGING_LIBDIR} -lopenobex +export GLIBINC = "-I${STAGING_INCDIR}/glib-2.0" +export GLIBLIB = "-I${STAGING_LIBDIR} -lglib-2.0" +export OBEXINC = "-I${STAGING_INCDIR}" +export OBEXLIB = "-L${STAGING_LIBDIR} -Wl,-rpath,${STAGING_LIBDIR} -lopenobex" do_configure() { rm -f client/*.o client/ussp-push -- cgit v1.2.3