diff options
-rw-r--r-- | conf/checksums.ini | 52 | ||||
-rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 1 | ||||
-rw-r--r-- | packages/ekiga/ekiga_3.1.0.bb | 4 | ||||
-rw-r--r-- | packages/libtorrent/libtorrent_0.12.4.bb | 17 | ||||
-rw-r--r-- | packages/libtorrent/rtorrent_0.8.4.bb | 13 | ||||
-rw-r--r-- | packages/socketcan/files/autotoolize.patch | 188 | ||||
-rw-r--r-- | packages/socketcan/socketcan-modules_svn.bb | 5 | ||||
-rw-r--r-- | packages/socketcan/socketcan-utils-test_svn.bb | 15 |
8 files changed, 291 insertions, 4 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index ea4913332a..69999e091b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -3242,6 +3242,10 @@ sha256=d391829686eb002ace3ffbfed75c35e877b42c1884c9359791634b5b57126797 md5=d8f3bbfbcc337d9776991d9561f451f3 sha256=773ce12045ce98c3be4b1845547435f1b7798996fa3170dea72c7c15aa5ca79d +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec-r1.patch] +md5=ed96c1bddce4b7e40a40bad1d3cd63b5 +sha256=c178b3a7460cfaeb58c11ef9641d72ee912818b2ecbf1c09edf628d9168c0971 + [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec.patch] md5=97cdbeb23bc8c8f4fe563d10a0c8c110 sha256=2e5488039040e76bdedb08323f729a0ef0549d23b35bb740f541c960393ec378 @@ -3258,6 +3262,10 @@ sha256=5dad5d521e2bebb3847e84a84d04cc546f4cdda55e467a1cfec149378b7923ef md5=4fbebfebf03cb47cf6444bdb6f6b79b4 sha256=19681eedbb924eb253308befe12938ab53c7cb3e74fc3eded000d087d322b403 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie_pm-3.patch] +md5=812ee8bf3ea5739acb0ab2f732ecdc20 +sha256=8bb75a2577c72b4ad95851e545aafc7b0b89c3c41f087aea76b28635786f11c7 + [ftp://ftp.logilab.fr/pub/common/common-0.4.4.tar.gz] md5=4cd3ce38efbd27c6cf4223f0ced2a5b5 sha256=21341f1900b0fe919a2ad057c334f5d7172588e4262b3d1b0904da03a9db0cff @@ -3358,6 +3366,10 @@ sha256=b3b8da5e458f56246f735b499b32bc2a3a039d2d4092b1b249c60a188c2314d5 md5=705eebe74d98397e26193e0db9612b03 sha256=905ee280a38f479ab7da75e6dfba21f221b23bb068111ebddc4c2e853f3fff09 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/config.patch] +md5=c8be31ffebdae0e007ea587a11994e75 +sha256=64dfe89e56167bde80c6a18831b5a4259215c78c34ca16f4cb9fde10ffe54437 + [http://download.savannah.gnu.org/releases/confuse/confuse-2.5.tar.gz] md5=4bc9b73d77ebd571ac834619ce0b3582 sha256=65451d8d6f5d4ca1dbd0700f3ef2ef257b52b542b3bab4bbeddd539f1c23f859 @@ -13058,6 +13070,10 @@ sha256=3287c9be61f9ec8ddab99f9b679bbf58610d024bce980307f88151a552ecd1e3 md5=db7c7a2236c2f6af5e02cf3e9384eb67 sha256=6044618e37c2925615a08517e8b69ef84147ef5287a222fc451968b36a0a9be7 +[http://libtorrent.rakshasa.no/downloads/libtorrent-0.12.4.tar.gz] +md5=7e4b4c29a69c86c38e3e60ec11fc2255 +sha256=a48c307fdcc77a28ee3a2ba0b68501a42e3709bf693c52df4831b87c71c8c359 + [http://downloads.sourceforge.net/giflib/libungif-4.1.3.tar.bz2] md5=8c198831cc0495596c78134b8849e9ad sha256=59e835a57e6df03e4d2253b2357253f3d13da9473ff465563a3b9833a744fc36 @@ -13574,6 +13590,10 @@ sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb md5=2cc2fd4d521dc5d7cfce0d8a9d1b3472 sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/linux-2.6.24-SIMpad-rtc-sa1100.patch] +md5=f0e143ed696bb064804cf0970718b414 +sha256=7aad0d9df138fa99332a82ca69eb07504b04e9b0a3cdb405ce872ca3bd4f44ac + [http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.24.3.atmel.3.tar.bz2] md5=952715cc523f4a77e7c5f94f608594c0 sha256=d26a1de101692958fbca1d1be40fe52bd605636baea616a3e8ed96e422a3648d @@ -13782,6 +13802,10 @@ sha256=6f11fc04a1f3f04ebb996723fc86ca363c3959ca1ef76d1057db9db3ea5a98d0 md5=db9ec09fb75c7326527f1f8b2cbf2ec2 sha256=2f6d619ebbab25f5b5091555f96dc29159fa3c214d1c5fdc5673af97515d18e6 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomo-r1.patch] +md5=31c32cadae5a7469cf94bf8bae658515 +sha256=788f1cc9c699c60408591eba0a057bfdf51cedef539b52fe8ddba39dd948aee6 + [http://www.rpsys.net/openzaurus/patches/archive/locomo_kbd_tweak-r1.patch] md5=6c0d60bcc357365af056baa812c45960 sha256=830ef8c4b65ed34954afc2581447fd0a9afcf5f9de354772352c8da54dceb676 @@ -13802,6 +13826,10 @@ sha256=0c629eac7ba7fcfc86228d3070579eff774bf0d61ea9b1c4ed93d5c13af97b53 md5=f80615d9020c2d56a4a41dfa93ba8429 sha256=34202206b33ebab7c34be20bd41fc8249745011a355be690ba997aa8e7d77943 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomo_spi-6.patch] +md5=44bb0f9f1fb07efbbb41619a44ed04ce +sha256=50502256533d1fc62ac3f4a29a7e212835592bfbfd47f36b607c20e72297a63d + [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/locomo_spi-r3.patch] md5=e7773693243f7a7b4b0a76ae61e4881f sha256=2e5bd2c74f01832945a27400bfbc779633b0e679d0bfe967744795e39b5d3165 @@ -14790,6 +14818,10 @@ sha256=f79dff54153dc3beb9eb3f2e4776dbc55ed2a4d3d0adbf9c8a2d9eb230ed3850 md5=75bbd1dc425849e415a60afd9e74d2ff sha256=e83b80b4ccd7863223fac4a2d54974a64a79c635d6bdda0c6e7039f966eae9e2 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mmc-spi.patch] +md5=329fd64f8ccdb2731c54f6a1b8c6de14 +sha256=27934de6da3f5ac94ed60ba4bfdd3acc2d93b01a2f932b576f87fb4508dcde6e + [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mmc_spi-r4.patch] md5=85922650d2e640e2cb723e71fd00a471 sha256=34cf9ceb9e811ee85c74ae2c217548e1d193741fbf9a43d37116f1d4e404f496 @@ -15114,6 +15146,10 @@ sha256=7206aaf289cd349ed0c52bf081b9a29a25d03e83eaf3e6de4a6070c4de1abe9d md5=dd6ca5b6006aa03febb611f481cdd7ba sha256=c7b9cd542fd9076d9a7cd5c033665fb05c6f412b3b235cb4379b0f8fe84fb351 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/mtd-sharp-flash-hack-r4.patch] +md5=a8ad16ca9b91a72c0e1c01952af5693d +sha256=2037e99cb87c350b6a2b155c5c780e724d50b1233d6e30689fc2e1ea3468f55a + [ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.0.0.tar.gz] md5=442bdbdb024db27dc9c89207fac16f95 sha256=c3ed189e314d0f1d106df3ecb80b1f1147e86fe6cd05ceb53652c1396b67ab2e @@ -18722,6 +18758,10 @@ sha256=597cefac4535d7f3b752253e5997b3c851c261b26b966a39beb032dcf1d5baa7 md5=d1b43acf08e371a56915293bbcf584c6 sha256=554456550ca6e792297d6d39367120af5b2bd6181d514a43faf4e2f565721908 +[http://libtorrent.rakshasa.no/downloads/rtorrent-0.8.4.tar.gz] +md5=dc0f37d933b0b6c713ad617e09441f3b +sha256=257722380b39e84e700e9f2d2f6600ba724723f1ed59327bfce47a57d293eeee + [ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.5.tar.gz] md5=3fbb02294a8ca33d4684055adba5ed6f sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58 @@ -18766,10 +18806,18 @@ sha256=04ecd2577ee0c210df610b4a5d870f2bda57c80962fb5b51ae9c4a94098c726c md5=7a0c73ccf0e31808ad37b61e730cd10e sha256=33d2363d40b1db7568864dc063ce4af70e50a9f9292a16445f0b167618d8fbba +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100-dma.patch] +md5=4336cca098b577608813a7c1454f2edd +sha256=c532c14ffb9358d1e0dbb67fce113c6aec0dd9c77ad41875222d69979baac9e7 + [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100-udc-r2.patch] md5=1b8cfd298b9fa10c4779c98fbe8e0bd3 sha256=564d375388284d7f13003202cba9fc1976b045bd14b3f12adec1449cded33f26 +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sa1100_spinlock.patch] +md5=946368c1a4961ac0362436e967055f76 +sha256=16554de4368956c1d3e1be4245d388bff4767390f2183bfe35b04327def508a5 + [http://heanet.dl.sourceforge.net/sablevm/sablevm-1.12.tar.gz] md5=6648af9bb5dd3dbbc8cb6835371f5ecd sha256=576c1af8affdebb0d5e10f8a8edad10e994965cef6db7980a3c52e25e15d6b94 @@ -19226,6 +19274,10 @@ sha256=947e7bfe44dad0caf8dc857b40fa840a316cc0d9b97aafefd134ef1fdb87753b md5=143bf72b794dbc24d36600f8e8aedbb7 sha256=0e87278dcee1d69d3bc44a3f028b4a73b78ceed3c0ba5ab174e6d2f4066bc4db +[http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/sharpsl_pm-4.patch] +md5=39b7dd5a77cf267d104e57dbfbfb1789 +sha256=a9880d7408e73c6c74ae975ed7fd20b2563459b68d6c4afdfc20f033c95b4d8b + [http://www.rpsys.net/openzaurus/patches/archive/sharpsl_pm-do-r2.patch] md5=416c6db0f2358ff9b88853dde2d6823f sha256=6c862826f6e0f72bb96ac7fca76c8118af65e65702dd55060d1ec06765f5add8 diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 1177ad50a1..077cb85775 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -209,6 +209,7 @@ SRCREV_pn-serial-forward ?= "4214" SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-socketcan-modules ?= "917" +SRCREV_pn-socketcan-utils-test ?= "917" SRCREV_pn-sphyrna-python ?= "45" SRCREV_pn-starling ?= "9574" SRCREV_pn-table ?= "2191" diff --git a/packages/ekiga/ekiga_3.1.0.bb b/packages/ekiga/ekiga_3.1.0.bb index 3eeef3007e..7baf40402d 100644 --- a/packages/ekiga/ekiga_3.1.0.bb +++ b/packages/ekiga/ekiga_3.1.0.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Gnome videoconferencing application" LICENSE = "GPLv2" -PR = "r1" +PR = "r2" inherit gnome -DEPENDS += " avahi libnotify eds-dbus libgnome gtkmm libsigc++-2.0 gstreamer gst-plugins-good gst-plugins-base gst-plugins-bad opal ptlib" +DEPENDS += " avahi libnotify eds-dbus libgnome gtkmm libsigc++-2.0 gstreamer gst-plugins-good gst-plugins-base gst-plugins-bad opal ptlib gnome-doc-utils" RDEPENDS += "gst-plugin-app gst-plugin-video4linux2 opal ptlib" EXTRA_OECONF = "--enable-static-libs --disable-ldap --disable-gnome --enable-gstreamer --disable-gdu --disable-scrollkeeper " diff --git a/packages/libtorrent/libtorrent_0.12.4.bb b/packages/libtorrent/libtorrent_0.12.4.bb new file mode 100644 index 0000000000..9673e5bdcb --- /dev/null +++ b/packages/libtorrent/libtorrent_0.12.4.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "library implementing the bittorrent protocol" +HOMEPAGE = "http://libtorrent.rakshasa.no" +SECTION = "libs/network" +LICENSE = "GPL" +DEPENDS = "libsigc++-2.0 openssl" + +SRC_URI = "http://libtorrent.rakshasa.no/downloads/libtorrent-${PV}.tar.gz" +PR = "r0" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--enable-aligned" + +do_stage() { + autotools_stage_all +} + diff --git a/packages/libtorrent/rtorrent_0.8.4.bb b/packages/libtorrent/rtorrent_0.8.4.bb new file mode 100644 index 0000000000..3390511ef9 --- /dev/null +++ b/packages/libtorrent/rtorrent_0.8.4.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Console bittorrent client using libtorrent" +HOMEPAGE = "http://libtorrent.rakshasa.no" +SECTION = "libs/network" +LICENSE = "GPL" +DEPENDS = "libtorrent curl ncurses gnutls libgpg-error" + +SRC_URI = "http://libtorrent.rakshasa.no/downloads/rtorrent-${PV}.tar.gz \ + file://autoconf-cross-fix.patch;patch=1" + +PR = "r0" + +inherit autotools + diff --git a/packages/socketcan/files/autotoolize.patch b/packages/socketcan/files/autotoolize.patch new file mode 100644 index 0000000000..ca8f629a1c --- /dev/null +++ b/packages/socketcan/files/autotoolize.patch @@ -0,0 +1,188 @@ + +Property changes on: test/Makefile.old +___________________________________________________________________ +Added: svn:mergeinfo + +Index: test/Makefile.am +=================================================================== +--- test/Makefile.am (revision 0) ++++ test/Makefile.am (revision 0) +@@ -0,0 +1,43 @@ ++AM_CFLAGS = @CFLAGS@ ++ ++bin_PROGRAMS = tst_raw \ ++ tst_raw_filter \ ++ tst_err \ ++ tst_raw_sendto \ ++ tst_packet \ ++ tst_filter_master \ ++ tst_filter_server \ ++ tst_bcm_cycle \ ++ tst_bcm_server \ ++ tst_bcm_tx_read \ ++ tst_bcm_rtr \ ++ tst_bcm_single \ ++ tst_bcm_filter \ ++ tst_bcm_throttle \ ++ tst_bcm_rx_sendto \ ++ tst_bcm_tx_sendto \ ++ tst_bcm_dump \ ++ tst_proc \ ++ canecho ++ ++tst_raw_SOURCES = tst-raw.c ++tst_raw_filter_SOURCES = tst-raw-filter.c ++tst_err_SOURCES = tst-err.c ++tst_raw_sendto_SOURCES = tst-raw-sendto.c ++tst_packet_SOURCES = tst-packet.c ++tst_filter_master_SOURCES = tst-filter-master.c ++tst_filter_server_SOURCES = tst-filter-server.c ++tst_bcm_cycle_SOURCES = tst-bcm-cycle.c ++tst_bcm_server_SOURCES = tst-bcm-server.c ++tst_bcm_tx_read_SOURCES = tst-bcm-tx_read.c ++tst_bcm_rtr_SOURCES = tst-bcm-rtr.c ++tst_bcm_single_SOURCES = tst-bcm-single.c ++tst_bcm_filter_SOURCES = tst-bcm-filter.c ++tst_bcm_throttle_SOURCES = tst-bcm-throttle.c ++tst_bcm_rx_sendto_SOURCES = tst-bcm-rx-sendto.c ++tst_bcm_tx_sendto_SOURCES = tst-bcm-tx-sendto.c ++tst_bcm_dump_SOURCES = tst-bcm-dump.c ++tst_proc_SOURCES = tst-proc.c ++canecho_SOURCES = canecho.c ++ ++ +Index: README +=================================================================== +--- README (revision 917) ++++ README (working copy) +@@ -57,10 +57,15 @@ + + 2b. Compile and install the user space utilities and test programs + +-... ++ autoreconf -i ++ ./configure ++ make install + +-[ Run make in can-utils and test dirs and cp binaries to /usr/local ] + ++To install to a temporary directory for development, you can do something like: ++ ++ ./configure --prefix=`pwd`/install ++ make install + + 3. How to use socketcan + + +Property changes on: can-utils/Makefile.old +___________________________________________________________________ +Added: svn:mergeinfo + +Index: can-utils/Makefile.am +=================================================================== +--- can-utils/Makefile.am (revision 0) ++++ can-utils/Makefile.am (revision 0) +@@ -0,0 +1,47 @@ ++ ++AM_CFLAGS = @CFLAGS@ ++ ++lib_LTLIBRARIES = libcanutils.la ++ ++libcanutils_la_SOURCES = lib.c lib.h ++ ++bin_PROGRAMS = candump cansniffer cansend canplayer canlogserver cangen \ ++ canbusload log2long log2asc asc2log vcan slcan_attach \ ++ isotpdump isotprecv isotpsend isotpsniffer isotptun slcanpty ++ ++ ++cansend_SOURCES = cansend.c lib.h ++cansend_LDADD = libcanutils.la ++ ++cangen_SOURCES = cangen.c lib.h ++cangen_LDADD = libcanutils.la ++ ++candump_SOURCES = candump.c lib.h ++candump_LDADD = libcanutils.la ++ ++canplayer_SOURCES = canplayer.c lib.h ++canplayer_LDADD = libcanutils.la ++ ++canlogserver_SOURCES = canlogserver.c lib.h ++canlogserver_LDADD = libcanutils.la ++ ++log2long_SOURCES = log2long.c lib.h ++log2long_LDADD = libcanutils.la ++ ++log2asc_SOURCES = log2asc.c lib.h ++log2asc_LDADD = libcanutils.la ++ ++asc2log_SOURCES = asc2log.c lib.h ++asc2log_LDADD = libcanutils.la ++ ++canbusload_SOURCES = canbusload.c lib.h ++cansniffer_SOURCES = cansniffer.c ++vcan_SOURCES = vcan.c ++slcan_attach_SOURCES = slcan_attach.c ++isotpdump_SOURCES = isotpdump.c ++isotprecv_SOURCES = isotprecv.c ++isotpsend_SOURCES = isotpsend.c ++isotpsniffer_SOURCES = isotpsniffer.c ++isotptun_SOURCES = isotptun.c ++slcanpty_SOURCES = slcanpty.c ++ +Index: configure.ac +=================================================================== +--- configure.ac (revision 0) ++++ configure.ac (revision 0) +@@ -0,0 +1,26 @@ ++AC_INIT(socketcan, 0.1) ++AM_INIT_AUTOMAKE([-Wall -Werror foreign]) ++AC_PROG_CC ++ ++# for now we disable shared libs for simplicity -- we might ++# want to use them at some point in the future ++AC_DISABLE_SHARED ++ ++AC_PROG_LIBTOOL ++ ++CFLAGS="$CFLAGS \ ++ -O2 -Wall -Wno-parentheses -I../kernel/2.6/include \ ++ -fno-strict-aliasing \ ++ -DETH_P_CAN=0x000C \ ++ -DPF_CAN=29 \ ++ -DAF_CAN=PF_CAN \ ++ " ++ ++AC_CONFIG_HEADERS([config.h]) ++AC_OUTPUT([ ++Makefile ++test/Makefile ++can-utils/Makefile ++]) ++ ++ +Index: Makefile.am +=================================================================== +--- Makefile.am (revision 0) ++++ Makefile.am (revision 0) +@@ -0,0 +1,19 @@ ++ ++ ++SUBDIRS = test can-utils ++ ++KERNELDIR = /usr/src/linux ++ ++VERSION = $(shell awk '/^VERSION/ {print $$3}' $(KERNELDIR)/Makefile) ++PATCHLEVEL = $(shell awk '/^PATCHLEVEL/ {print $$3}' $(KERNELDIR)/Makefile) ++SUBLEVEL = $(shell awk '/^SUBLEVEL/ {print $$3}' $(KERNELDIR)/Makefile) ++EXTRAVERSION = $(shell awk '/^EXTRAVERSION/{print $$3}' $(KERNELDIR)/Makefile) ++KERNELRELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) ++ ++patch26: ++ ./mkpatch $(KERNELRELEASE) >patch-$(KERNELRELEASE)-socketcan < FILES-2.6 ++ ++patch26all: ++ ./mkpatch $(KERNELRELEASE) >patch-$(KERNELRELEASE)-socketcan-all < FILES-2.6-ALL ++ ++ + diff --git a/packages/socketcan/socketcan-modules_svn.bb b/packages/socketcan/socketcan-modules_svn.bb index ce0493127e..5bf1aff0ff 100644 --- a/packages/socketcan/socketcan-modules_svn.bb +++ b/packages/socketcan/socketcan-modules_svn.bb @@ -4,10 +4,11 @@ SECTION = "kernel/modules" LICENSE = "GPL" DEPENDS = "virtual/kernel" PV = "0.0+svnr${SRCREV}" +PR = "r1" -SRC_URI = "svn://svn.berlios.de/socketcan/trunk;module=kernel;proto=svn" +SRC_URI = "svn://svn.berlios.de/socketcan;module=trunk;proto=svn" -S = "${WORKDIR}/kernel/2.6" +S = "${WORKDIR}/trunk/kernel/2.6" inherit module diff --git a/packages/socketcan/socketcan-utils-test_svn.bb b/packages/socketcan/socketcan-utils-test_svn.bb new file mode 100644 index 0000000000..23b1c5ad08 --- /dev/null +++ b/packages/socketcan/socketcan-utils-test_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Socketcan user space utilities and test apps" +HOMEPAGE = "http://developer.berlios.de/projects/socketcan/" +SECTION = "console/utils" +LICENSE = "GPL" + +PV = "0.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.berlios.de/socketcan;module=trunk;proto=svn \ + file://autotoolize.patch;patch=1;pnum=0 \ + " + +S = "${WORKDIR}/trunk" + +inherit autotools + |