[OpenWrt-Devel] [PATCH] add new package mpdas
a last.fm (audioscrobbler) daemon. this tool needs less deps than scmpc and it supports the newer last.fm protocol --- Signed-off-by: michu at neophob.com Index: feeds/packages/sound/mpdas/files/mpdas.init === --- feeds/packages/sound/mpdas/files/mpdas.init (revision 0) +++ feeds/packages/sound/mpdas/files/mpdas.init (revision 0) @@ -0,0 +1,11 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2009 OpenWrt.org +START=94 + +start() { + /usr/bin/mpdas -c /etc/mpdasrc +} + +stop() { + killall mpdas +} Index: feeds/packages/sound/mpdas/files/mpdasrc === --- feeds/packages/sound/mpdas/files/mpdasrc (revision 0) +++ feeds/packages/sound/mpdas/files/mpdasrc (revision 0) @@ -0,0 +1,5 @@ +username = username_here +# create md5 password: +# echo -n password | md5sum +password = md5_hash_here +debug = 0 Index: feeds/packages/sound/mpdas/Makefile === --- feeds/packages/sound/mpdas/Makefile (revision 0) +++ feeds/packages/sound/mpdas/Makefile (revision 0) @@ -0,0 +1,48 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=mpdas +PKG_VERSION:=0.2.4 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://50hz.ws/mpdas +PKG_MD5SUM:=8a694691dcb5d217c46754e40152186a + +include $(INCLUDE_DIR)/package.mk + +define Package/mpdas + SECTION:=sound + CATEGORY:=Sound + TITLE:=A MPD client which submits your tracks to Last.Fm + DEPENDS:=+libcurl +libmpd +libstdcpp + URL:=http://50hz.ws/mpdas/ +endef + +define Package/mpdas/description +mpdas is an AudioScrobbler client for MPD written in C++. +It supports the latest AudioScrobbler protocol (1.21). +In case of a downtime or connectivity problems, mpdas will +cache the played songs to ~/.mpdascache. +endef + +MAKE_FLAGS += \ + $(TARGET_CONFIGURE_OPTS) \ + $(1) \ + +define Package/mpdas/install + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./files/mpdasrc $(1)/etc/mpdasrc + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/mpdas $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/mpdas.init $(1)/etc/init.d/mpdas +endef + +$(eval $(call BuildPackage,mpdas)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] update lcd4linux
this patch updates lcd4linux to the latest svn version. this patch needs the package libvncserver. Signed-off-by: michu at neophob.com --- Index: Config.in === --- Config.in (revision 15744) +++ Config.in (working copy) @@ -28,6 +28,10 @@ bool prompt G15 +config LCD4LINUX_DRV_GLCD2USB + bool + prompt GLCD2USB + config LCD4LINUX_DRV_HD44780 bool prompt HD44780 @@ -64,6 +68,10 @@ bool prompt MatrixOrbital +config LCD4LINUX_DRV_MatrixOrbitalGX + bool + prompt MatrixOrbitalGX + config LCD4LINUX_DRV_MilfordInstruments bool prompt MilfordInstruments @@ -89,6 +97,10 @@ bool prompt Pertelian +config LCD4LINUX_DRV_PHAnderson + bool + prompt PHAnderson + config LCD4LINUX_DRV_picoLCD bool prompt picoLCD @@ -105,6 +117,10 @@ bool prompt serdisplib +config LCD4LINUX_DRV_ShuttleVFD + bool + prompt ShuttleVFD + config LCD4LINUX_DRV_SimpleLCD bool prompt SimpleLCD @@ -133,6 +149,10 @@ bool prompt ULA200 +config LCD4LINUX_DRV_VNC + bool + prompt VNC + config LCD4LINUX_DRV_WincorNixdorf bool prompt WincorNixdorf @@ -183,6 +203,10 @@ bool prompt gps +config LCD4LINUX_PLUGIN_hddtemp + bool + prompt hddtemp + config LCD4LINUX_PLUGIN_i2c_sensors bool prompt i2c_sensors @@ -215,10 +239,22 @@ bool prompt mpd +config LCD4LINUX_PLUGIN_mpris_dbus + bool + prompt mpris_dbus + config LCD4LINUX_PLUGIN_mysql bool prompt mysql +config LCD4LINUX_PLUGIN_netdev + bool + prompt netdev + +config LCD4LINUX_PLUGIN_netinfo + bool + prompt netinfo + config LCD4LINUX_PLUGIN_pop3 bool prompt pop3 @@ -235,6 +271,10 @@ bool prompt python +config LCD4LINUX_PLUGIN_qnaplog + bool + prompt qnaplog + config LCD4LINUX_PLUGIN_seti bool prompt seti @@ -251,6 +291,10 @@ bool prompt uptime +config LCD4LINUX_PLUGIN_w1retap + bool + prompt w1retap + config LCD4LINUX_PLUGIN_wireless bool prompt wireless Index: Makefile === --- Makefile (revision 15744) +++ Makefile (working copy) @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lcd4linux -PKG_REV:=903 +PKG_REV:=1034 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -55,6 +55,7 @@ Cwlinux \ D4D \ G15 \ + GLCD2USB \ IRLCD \ HD44780 \ LCD2USB \ @@ -64,16 +65,19 @@ LUIse \ M50530 \ MatrixOrbital \ + MatrixOrbitalGX \ MilfordInstruments \ Noritake \ NULL \ PNG \ PPM \ Pertelian \ + PHAnderson \ picoLCD \ picoLCDGraphic \ RouterBoard \ serdisplib \ + ShuttleVFD \ SimpleLCD \ st2205 \ T6963 \ @@ -81,6 +85,7 @@ USBLCD \ USBHUB \ ULA200 \ + VNC \ WincorNixdorf \ X11 \ @@ -95,24 +100,30 @@ fifo \ file \ gps \ + hddtemp \ i2c_sensors \ iconv \ imon \ isdn \ kvv \ loadavg \ + netdev \ + netinfo \ meminfo \ mpd \ + mpris_dbus \ mysql \ netdev \ pop3 \ ppp \ proc_stat \ python \ + qnaplog \ seti \ statfs \ uname \ uptime \ + w1retap \ wireless \ xmms \ @@ -166,6 +177,10 @@ PKG_BUILD_DEPENDS += libncurses endif +ifneq ($(CONFIG_LCD4LINUX_DRV_VNC),) +PKG_BUILD_DEPENDS += libvncserver +endif + ifneq ($(CONFIG_LCD4LINUX_DRV_X11),) PKG_BUILD_DEPENDS += libgd, libX11 endif ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v2] update mpc to 0.15 and fix compilaton
hey jan no i didn't forget, your patch didn't remove the dir ;) but i just removed it... ill test the new mpd source asap, x86 and bcm47xx. cheers On Tue, 2009-02-17 at 20:20 +0100, Jan Willies wrote: hey michu and list, Thanks for updating the packages.Sorry for the patch-v2-confusion, but I think you forgot to svn delete sound/mpc/patches, because 001-uclibc.patch is not needed anymore. I'm however hunting down a real nasty bug in uclibc or somewhere, which has something to do with threading behaving really weird :/ Have you noticed something with latest trunk and mpd or scmpc? On my x86 machine they don't work when sent into the background. I have to kill -32 (RTMIN) the lowest PID, after that it works. strace: http://pastebin.com/m62495427 I'm currently building a kernel with ELF_CORE and try to get a corefile for better debugging, but I really have no clue :S When started in the foreground, mpd/scmpc work just fine. cheers - jan Am Dienstag, den 17.02.2009, 19:53 +0100 schrieb Jan Willies: changes since v1: fix compilation the proper way Signed-off-by: Jan Willies j...@willies.info === --- sound/mpc/Makefile (Revision 14534) +++ sound/mpc/Makefile (Arbeitskopie) @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mpc -PKG_VERSION:=0.14 +PKG_VERSION:=0.15 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=...@sf/musicpd -PKG_MD5SUM:=f4218602342cf322872a41dfe0cc72e1 +PKG_MD5SUM:=48897aeb3a7ee5c64f30e56789f105a8 include $(INCLUDE_DIR)/package.mk @@ -40,6 +40,7 @@ define Build/Compile $(call Build/Compile/Default,\ + CFLAGS=$(TARGET_CFLAGS) -std=gnu99 \ prefix=/usr \ all \ ) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] mpd update
hey i created a patch to update mpd to v0.14. i guess it looks a bit strange, any comments about this? cheers Signed-off-by: Michael Vogt mi...@neophob.com --- Index: Makefile === --- Makefile (revision 13855) +++ Makefile (working copy) @@ -9,19 +9,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mpd -PKG_VERSION:=0.13.2 +PKG_VERSION:=0.14 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.musicpd.org/uploads/files/ -PKG_MD5SUM:=b461896369949ff3cff955692ead9f8b +PKG_SOURCE_URL:=...@sf/musicpd +PKG_MD5SUM:=ee282390146ead636f3d992399ed3c20 include $(INCLUDE_DIR)/package.mk define Package/mpd SECTION:=sound CATEGORY:=Sound - DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +libiconv + DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +libiconv +glib2 TITLE:=Music Player Daemon URL:=http://www.musicpd.org/ endef @@ -40,23 +40,31 @@ EXTRA_CONFIG_PARAM:=--disable-alsa endif +CONFIGURE_VARS += \ + ID3TAG_LIBS=-L$(STAGING_DIR)/usr/lib -lz -lid3tag \ + ID3TAG_CFLAGS=-I$(STAGING_DIR)/usr/include \ + MAD_LIBS=-L$(STAGING_DIR)/usr/lib -lmad \ + MAD_CFLAGS=-I$(STAGING_DIR)/usr/include \ + OGGVORBIS_LIBS=-L$(STAGING_DIR)/usr/lib -lvorbisidec \ + OGGVORBIS_CFLAGS=-I$(STAGING_DIR)/usr/include \ + GLIB_CFLAGS=-I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/usr/lib/glib-2.0/include \ + GLIB_LIBS=-L$(STAGING_DIR)/usr/lib/libintl/lib -lintl -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv -L$(STAGING_DIR)/usr/lib -lglib-2.0 -lgthread-2.0 -pthread + define Build/Configure $(call Build/Configure/Default, \ - $(EXTRA_CONFIG_PARAM) \ - --disable-mod \ - --disable-audiofile \ - --disable-mpc \ - --disable-aac \ + $(EXTRA_CONFIG_PARAM) \ + --disable-mod \ + --disable-audiofile \ + --disable-mpc \ + --disable-aac \ --disable-lsr \ - --with-tremor \ - --with-id3tag-includes=$(STAGING_DIR)/usr/include \ - --with-id3tag-libraries=$(STAGING_DIR)/usr/lib \ - --with-libFLAC-includes=$(STAGING_DIR)/usr/include \ - --with-libFLAC-libraries=$(STAGING_DIR)/usr/lib \ - --with-mad-includes=$(STAGING_DIR)/usr/include \ - --with-mad-libraries=$(STAGING_DIR)/usr/lib \ - --with-iconv-includes=$(STAGING_DIR)/usr/lib/libiconv/include \ - --with-iconv-libraries=$(STAGING_DIR)/usr/lib/libiconv/lib \ + --disable-ipv6 \ + --disable-ao \ + --disable-mvp \ + --disable-lametest \ + --disable-lame \ + --disable-flac \ + --with-tremor=$(STAGING_DIR)/usr/lib \ ) endef ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] mpd
hey, this patch should fix #4026. currently, mpd depends on libsamplerate: [EMAIL PROTECTED]:~/trunk2/trunk$ objdump -p build_dir/mipsel/mpd-0.13.2/src/mpd | grep NEEDED NEEDED libnsl.so.0 NEEDED libsamplerate.so.0 NEEDED libasound.so.2 NEEDED libdl.so.0 NEEDED libpthread.so.0 NEEDED libiconv.so.2 NEEDED libid3tag.so.0 NEEDED libz.so.1 NEEDED libmad.so.0 NEEDED libFLAC.so NEEDED libm.so.0 NEEDED libvorbisidec.so.1 NEEDED libgcc_s.so.1 NEEDED libc.so.0 libsamplerate is quite large: 1336652 2008-09-21 06:17 bin/packages/mipsel/libsamplerate_0.1.3-2_mipsel.ipk so it would make sense to compile mpd per default without libsamplerate, as more than 1 mb for a feature you probably don't need is quite a waste of space... cheers michu Signed-off-by: Michael Vogt michu at neophob.com --- Index: Makefile === --- Makefile (revision 12617) +++ Makefile (working copy) @@ -47,6 +47,7 @@ --disable-audiofile \ --disable-mpc \ --disable-aac \ + --disable-lsr \ --with-tremor \ --with-id3tag-includes=$(STAGING_DIR)/usr/include \ --with-id3tag-libraries=$(STAGING_DIR)/usr/lib \ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] update lcd4linux, cleanup deps
this patch cleans up lcd4linux deps. Signed-off-by: Michael Vogt michu at neophob.com Index: Config.in === --- Config.in (revision 11392) +++ Config.in (working copy) @@ -70,11 +70,11 @@ config LCD4LINUX_DRV_PNG bool - prompt PNG (you need to select libgd) + prompt PNG config LCD4LINUX_DRV_PPM bool - prompt PPM (you need to select libgd) + prompt PPM config LCD4LINUX_DRV_Pertelian bool @@ -98,7 +98,7 @@ config LCD4LINUX_DRV_st2205 bool - prompt st2205 (you need to select st2205tool) + prompt st2205 config LCD4LINUX_DRV_T6963 bool @@ -164,7 +164,7 @@ config LCD4LINUX_PLUGIN_gps bool - prompt gps (you need to select libnmeap) + prompt gps config LCD4LINUX_PLUGIN_i2c_sensors bool Index: Makefile === --- Makefile (revision 11392) +++ Makefile (working copy) @@ -11,7 +11,7 @@ PKG_NAME:=lcd4linux PKG_REV:=877 PKG_VERSION:=r$(PKG_REV) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/ @@ -26,7 +26,7 @@ define Package/lcd4linux SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libncurses +libusb +libiconv +libgd + DEPENDS:=+libusb TITLE:=LCD display utility URL:=http://lcd4linux.bulix.org/ endef @@ -130,14 +130,58 @@ PKG_BUILD_DEPENDS += libgd endif +ifneq ($(CONFIG_LCD4LINUX_DRV_G15),) +PKG_BUILD_DEPENDS += libgd +endif + +ifneq ($(CONFIG_LCD4LINUX_DRV_LPH7508),) +PKG_BUILD_DEPENDS += libgd +endif + +ifneq ($(CONFIG_LCD4LINUX_DRV_LUIse),) +PKG_BUILD_DEPENDS += libgd +endif + +ifneq ($(CONFIG_LCD4LINUX_DRV_Noritake),) +PKG_BUILD_DEPENDS += libgd +endif + +ifneq ($(CONFIG_LCD4LINUX_DRV_serdisplib),) +PKG_BUILD_DEPENDS += libgd, serdisplib +endif + ifneq ($(CONFIG_LCD4LINUX_DRV_st2205),) -PKG_BUILD_DEPENDS += st2205tool +PKG_BUILD_DEPENDS += libgd, st2205tool endif +ifneq ($(CONFIG_LCD4LINUX_DRV_T6963),) +PKG_BUILD_DEPENDS += libgd +endif + +ifneq ($(CONFIG_LCD4LINUX_DRV_Curses),) +PKG_BUILD_DEPENDS += libncurses +endif + +ifneq ($(CONFIG_LCD4LINUX_DRV_X11),) +PKG_BUILD_DEPENDS += libgd, libX11 +endif + ifneq ($(CONFIG_LCD4LINUX_PLUGIN_gps),) PKG_BUILD_DEPENDS += libnmeap endif +ifneq ($(CONFIG_LCD4LINUX_PLUGIN_iconv),) +PKG_BUILD_DEPENDS += libiconv +endif + +ifneq ($(CONFIG_LCD4LINUX_PLUGIN_mysql),) +PKG_BUILD_DEPENDS += libmysqlclient +endif + + +## TODO PYTHON PLUGIN, DEPENDS on ver = '2.1.0' + + EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib/libiconv/include EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] bluez-utils update
remove the useless passkey-agent tool - this is just a working example for coders without any use. Signed-off-by: Michael Vogt michu at neophob.com Index: bluez-utils/Makefile === --- bluez-utils/Makefile (revision 10911) +++ bluez-utils/Makefile (working copy) @@ -10,7 +10,7 @@ PKG_NAME:=bluez-utils PKG_VERSION:=3.24 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://bluez.sourceforge.net/download @@ -54,14 +54,11 @@ all install endef -#copy bluetooth.conf nach /etc/dbus-1/system.d/ - define Package/bluez-utils/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/../daemon/passkey-agent $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/bluetooth $(CP) $(PKG_INSTALL_DIR)/../hcid/hcid.conf $(1)/etc/bluetooth/ $(CP) $(PKG_INSTALL_DIR)/../rfcomm/rfcomm.conf $(1)/etc/bluetooth/ ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] new package: st2205tool
this library is useful for hacked picframe displays. you can use this lib also with lcd4linux. check http://picframe.spritesserver.nl/wiki for more information. Signed-off-by: Michael Vogt michu at neophob.com Index: st2205tool/patches/120-setpic-makefile.patch === --- st2205tool/patches/120-setpic-makefile.patch (revision 0) +++ st2205tool/patches/120-setpic-makefile.patch (revision 0) @@ -0,0 +1,18 @@ +--- st2205tool/setpic/Makefile.orig 2008-01-20 19:50:11.0 +0100 st2205tool/setpic/Makefile 2008-04-22 16:06:40.0 +0200 +@@ -1,12 +1,12 @@ + SRC = main.c + OBJ = main.o +-CFLAGS = -g -Wall -I../libst2205 +-LIBS = -lgd -L../libst2205 -lst2205 ++#CFLAGS = -g -Wall -I./../libst2205 ++#LIBS = -lgd -lst2205 + + all: setpic + + setpic: $(OBJ) $(SRC) +- gcc -o $(@) $(OBJ) $(LIBS) $(FLAGS) ++ $(GCC) -o $(@) $(OBJ) $(SETPICLIBS) $(CFLAGS) + + clean: + rm -f $(OBJ) setpic Index: st2205tool/patches/100-base-makefile.patch === --- st2205tool/patches/100-base-makefile.patch (revision 0) +++ st2205tool/patches/100-base-makefile.patch (revision 0) @@ -0,0 +1,37 @@ +--- st2205tool/Makefile.orig 2008-01-22 00:43:38.0 +0100 st2205tool/Makefile 2008-04-22 16:01:46.0 +0200 +@@ -6,26 +6,26 @@ + all: libst2205/libst2205.so setpic/setpic phack splice bgrep + + install: all +- make -C libst2205 install ++ $(MAKE) -C libst2205 install + + libst2205/libst2205.so: +- make -C libst2205 ++ $(MAKE) -C libst2205 + + setpic/setpic: +- make -C setpic ++ $(MAKE) -C setpic + + phack: $(OBJ) $(SRC) +- gcc -o $(@) $(OBJ) $(LIBS) $(FLAGS) ++ $(GCC) -o $(@) $(OBJ) $(LIBS) $(FLAGS) + + splice: splice.o splice.c +- gcc -o splice splice.o ++ $(GCC) -o splice splice.o + + bgrep: bgrep.o bgrep.c +- gcc -o bgrep bgrep.o ++ $(GCC) -o bgrep bgrep.o + + clean: +- make -C libst2205 clean +- make -C setpic clean ++ $(MAKE) -C libst2205 clean ++ $(MAKE) -C setpic clean + rm -f $(OBJ) phack splice splice.o bgrep bgrep.o + + distclean: clean Index: st2205tool/patches/110-libst-makefile.patch === --- st2205tool/patches/110-libst-makefile.patch (revision 0) +++ st2205tool/patches/110-libst-makefile.patch (revision 0) @@ -0,0 +1,25 @@ +--- st2205tool/libst2205/Makefile.orig 2008-01-20 20:22:32.0 +0100 st2205tool/libst2205/Makefile 2008-04-21 07:36:56.0 +0200 +@@ -6,15 +6,15 @@ + all: libst2205.so + + libst2205.so: $(OBJ) $(SRC) +- ar -rv libst2205.a $(OBJ) +- gcc -shared -Wl,-soname,libst2205.so.1 -o libst2205.so $(OBJ) $(LIBS) ++ $(AR) -rv libst2205.a $(OBJ) ++ $(GCC) -shared -Wl,-soname,libst2205.so -o libst2205.so $(OBJ) $(LIBS) + + clean: + rm -f $(OBJ) test *.a *.so + + install: libst2205.so +- test -z /usr/local/lib || /bin/mkdir -p /usr/local/lib +- test -z /usr/local/include || /bin/mkdir -p /usr/local/include +- install libst2205.so /usr/local/lib +- install st2205.h /usr/local/include +- ldconfig ++# test -z /usr/local/lib || /bin/mkdir -p /usr/local/lib ++# test -z /usr/local/include || /bin/mkdir -p /usr/local/include ++# install libst2205.so /usr/local/lib ++# install st2205.h /usr/local/include ++# ldconfig Index: st2205tool/Makefile === --- st2205tool/Makefile (revision 0) +++ st2205tool/Makefile (revision 0) @@ -0,0 +1,58 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id: + +include $(TOPDIR)/rules.mk + +PKG_NAME:=st2205tool +PKG_VERSION:=1.4pre1 +PKG_RELEASE:=1 + +PKG_SOURCE:=st2205tool-v$(PKG_VERSION).tgz +PKG_SOURCE_URL:=http://spritesmods.com/picframe/ +PKG_MD5SUM:=bf602227bce9c4365e5ae5e9b383d8d9 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) + +include $(INCLUDE_DIR)/package.mk + +define Package/st2205tool + SECTION:=libs + CATEGORY:=Libraries + TITLE:=ST220xu powered photo-frames library + DEPENDS:=libgd + URL:=http://picframe.spritesserver.nl/wiki/ +endef + +define Package/st2205tool/description + Library for hacked photo-frames based on st220xu chipset. You may use those photo-frames with + mplayer or LCD4Linux +endef + +MAKE_FLAGS += \ + CFLAGS=$(TARGET_CPPFLAGS) $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/libst2205/ \ + LDFLAGS=-L$(STAGING_DIR)/usr/lib \ + SETPICLIBS=-L$(STAGING_DIR)/usr/lib -lgd -ljpeg -lpng -lz -L../libst2205 -lst2205 \ + + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_BUILD_DIR)/libst2205/st2205.h $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_BUILD_DIR)/libst2205/libst2205.{a,so*} $(1)/usr/lib/ +endef + + +define Package/st2205tool/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/{bgrep,phack,splice,hackfw.sh} $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/setpic/setpic $(1)/usr/sbin
[OpenWrt-Devel] [PATCH] update lcd4linux
update lcd4linux to the latest svn version Signed-off-by: Michael Vogt michu at neophob.com Index: lcd4linux/Makefile === --- lcd4linux/Makefile (revision 10911) +++ lcd4linux/Makefile (working copy) @@ -9,9 +9,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lcd4linux -PKG_REV:=847 +PKG_REV:=877 PKG_VERSION:=r$(PKG_REV) -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/ @@ -26,7 +26,7 @@ define Package/lcd4linux SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libncurses +libusb +libgd + DEPENDS:=+libncurses +libusb +libiconv +libgd TITLE:=LCD display utility URL:=http://lcd4linux.bulix.org/ endef @@ -41,11 +41,11 @@ endef # commas are interpreted by the $(call ...) macro, so define an intermediate variable holding our drivers and plugins spec -PKG_CONFIGURE_DRIVERS:=all,!PNG,!RouterBoard,!X11,!serdisplib,!G15 -PKG_CONFIGURE_PLUGINS:=wireless +PKG_CONFIGURE_DRIVERS:=all,!PNG,!PPM,!RouterBoard,!X11,!serdisplib,!G15 +PKG_CONFIGURE_PLUGINS:=wireless,mpd,iconv,cpuinfo,loadavg,meminfo,proc_stat,uname,uptime -EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib +EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib/libiconv/include +EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib TARGET_CONFIGURE_OPTS+=\ CC=$(TARGET_CC) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] update lcd4linux
I agree about selecting each plugin via menu would be nice. But for example ffmpeg just combine 3 different applications/libs into one Makefile, so ffmpeg is not really configurable. If there is a solution to select each plugin and driver via menu, I would be glad to use this in the Makefile. cheers Quoting Oliver Ertl [EMAIL PROTECTED]: update lcd4linux to the latest svn version Signed-off-by: Michael Vogt michu at neophob.com I think the Makefile should be made configurable in a way like the ffmpeg package is for the lcd4linux plugins. See: https://dev.openwrt.org/browser/packages/multimedia/ffmpeg ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] update bemusedlinuxserver
Update Bemusedlinuxserver to latest version. Signed-off-by: Michael Vogt michu at neophob.com Index: bemused/files/bemused.conf === --- bemused/files/bemused.conf (revision 10911) +++ bemused/files/bemused.conf (working copy) @@ -3,10 +3,9 @@ # You only need to set up options which have no default and which ware not optinal # this is a mpd-hack version by [EMAIL PROTECTED] -# just for information: xmms means mpd! # Path to mpd (if mpd is in path only mpd) (default is mpd) -xmmsdir=/usr/local/bin/mpd +mpddir=/usr/local/bin/mpd # channel for what the serial port service is registered (with sdptool look in README) (default 10) # example: @@ -31,10 +30,6 @@ # point this directory to the mpd music directory! mp3dir=/ -# whether to autostart mpd when the server is started (0 (no) or 1 (yes)) (default=1) -# THIS OPTION IS NOT SUPPORTED! -# autostartxmms=0 - # bookmarks file for URLs of net radio stations (optional) bookmarkfile=/etc/bemused-bookmarks Index: bemused/Makefile === --- bemused/Makefile (revision 10911) +++ bemused/Makefile (working copy) @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bemused-mpd -PKG_VERSION:=r047 +PKG_VERSION:=r059 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/382 -PKG_MD5SUM:=f40715812d59d2ab1bd93f96c5e8818b +PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/512 +PKG_MD5SUM:=76cb208842cce784fd65ec4d392fd6cb PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install @@ -24,7 +24,7 @@ define Package/bemusedlinuxserver SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp + DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp +libiconv TITLE:=Bemused linux server URL:=http://bemused-lnx-mpdhack.origo.ethz.ch/ endef @@ -42,8 +42,8 @@ CFLAGS=$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) \ LDFLAGS=$(TARGET_LDFLAGS) \ CPPFLAGS=$(TARGET_CPPFLAGS) \ - INCL=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include \ - MYLIBS=-lbluetooth -lglib + INCL=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include -I$(STAGING_DIR)/usr/lib/libiconv/include \ + MYLIBS=-lbluetooth -lglib -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv $(STRIP) $(PKG_BUILD_DIR)/bemusedlinuxserver endef Index: bemused/patches/100-iconv.patch === --- bemused/patches/100-iconv.patch (revision 0) +++ bemused/patches/100-iconv.patch (revision 0) @@ -0,0 +1,13 @@ +--- bemused-mpd-r059/mpdctrl.orig 2008-04-23 11:53:58.0 +0200 bemused-mpd-r059/mpdctrl.c 2008-04-23 14:36:34.0 +0200 +@@ -160,8 +160,8 @@ + } + + /* OpenWRT needs a type cast */ +-/* iconv_value = iconv(i, (const char **)p1, fromlen, p2, tolen); */ +-iconv_value = iconv(i, p1, fromlen, p2, tolen); ++iconv_value = iconv(i, (const char **)p1, fromlen, p2, tolen); ++/* iconv_value = iconv(i, p1, fromlen, p2, tolen); */ + if (iconv_value == (size_t) -1) { + error (ICONV ERROR3: failed to convert string, error: %d\n, errno); + return ICONV ERROR3; ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] mpd update
MPD should depend on libiconv, as mp3 tag's are stored internally as utf8. If libiconv in not available, tags with special characters will get displayed wrong (for example german umlauts, french characters etc). Signed-off-by: Michael Vogt michu at neophob.com Index: Makefile === --- Makefile (revision 10538) +++ Makefile (working copy) @@ -10,7 +10,7 @@ PKG_NAME:=mpd PKG_VERSION:=0.13.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.musicpd.org/uploads/files/ @@ -24,7 +24,7 @@ define Package/mpd SECTION:=sound CATEGORY:=Sound - DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +alsa-lib + DEPENDS:=+libflac +libid3tag +libmad +libvorbisidec +libpthread +alsa-lib +libiconv TITLE:=Music Player Daemon URL:=http://www.musicpd.org/ endef @@ -49,7 +49,6 @@ --disable-shout \ --disable-mod \ --disable-audiofile \ - --disable-iconv \ --disable-mpc \ --disable-aac \ --disable-oggvorbis \ @@ -60,6 +59,8 @@ --with-libFLAC-libraries=$(STAGING_DIR)/usr/lib \ --with-mad-includes=$(STAGING_DIR)/usr/include \ --with-mad-libraries=$(STAGING_DIR)/usr/lib \ + --with-iconv-includes=$(STAGING_DIR)/usr/lib/libiconv/include \ + --with-iconv-libraries=$(STAGING_DIR)/usr/lib/libiconv/lib \ ) endef ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] update bemusedlinuxserver
Sorry, I just fixed another bug.. now v060 Signed-off-by: Michael Vogt michu at neophob.com - Forwarded message from [EMAIL PROTECTED] - Date: Wed, 23 Apr 2008 14:43:49 +0200 From: [EMAIL PROTECTED] Reply-To: OpenWrt Development List openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH] update bemusedlinuxserver To: openwrt-devel@lists.openwrt.org Update Bemusedlinuxserver to latest version. Signed-off-by: Michael Vogt michu at neophob.com - End forwarded message - Index: files/bemused.conf === --- files/bemused.conf (revision 10911) +++ files/bemused.conf (working copy) @@ -3,10 +3,9 @@ # You only need to set up options which have no default and which ware not optinal # this is a mpd-hack version by [EMAIL PROTECTED] -# just for information: xmms means mpd! # Path to mpd (if mpd is in path only mpd) (default is mpd) -xmmsdir=/usr/local/bin/mpd +mpddir=/usr/local/bin/mpd # channel for what the serial port service is registered (with sdptool look in README) (default 10) # example: @@ -31,10 +30,6 @@ # point this directory to the mpd music directory! mp3dir=/ -# whether to autostart mpd when the server is started (0 (no) or 1 (yes)) (default=1) -# THIS OPTION IS NOT SUPPORTED! -# autostartxmms=0 - # bookmarks file for URLs of net radio stations (optional) bookmarkfile=/etc/bemused-bookmarks Index: patches/100-iconv.patch === --- patches/100-iconv.patch (revision 0) +++ patches/100-iconv.patch (revision 0) @@ -0,0 +1,13 @@ +--- bemused-mpd-r059/mpdctrl.orig 2008-04-23 11:53:58.0 +0200 bemused-mpd-r059/mpdctrl.c 2008-04-23 14:36:34.0 +0200 +@@ -160,8 +160,8 @@ + } + + /* OpenWRT needs a type cast */ +-/* iconv_value = iconv(i, (const char **)p1, fromlen, p2, tolen); */ +-iconv_value = iconv(i, p1, fromlen, p2, tolen); ++iconv_value = iconv(i, (const char **)p1, fromlen, p2, tolen); ++/* iconv_value = iconv(i, p1, fromlen, p2, tolen); */ + if (iconv_value == (size_t) -1) { + error (ICONV ERROR3: failed to convert string, error: %d\n, errno); + return ICONV ERROR3; Index: Makefile === --- Makefile (revision 10911) +++ Makefile (working copy) @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bemused-mpd -PKG_VERSION:=r047 +PKG_VERSION:=r060 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/382 -PKG_MD5SUM:=f40715812d59d2ab1bd93f96c5e8818b +PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/513 +PKG_MD5SUM:=08238fef7b00dec19c93d5aa481803c6 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install @@ -24,7 +24,7 @@ define Package/bemusedlinuxserver SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp + DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp +libiconv TITLE:=Bemused linux server URL:=http://bemused-lnx-mpdhack.origo.ethz.ch/ endef @@ -42,8 +42,8 @@ CFLAGS=$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) \ LDFLAGS=$(TARGET_LDFLAGS) \ CPPFLAGS=$(TARGET_CPPFLAGS) \ - INCL=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include \ - MYLIBS=-lbluetooth -lglib + INCL=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include -I$(STAGING_DIR)/usr/lib/libiconv/include \ + MYLIBS=-lbluetooth -lglib -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv $(STRIP) $(PKG_BUILD_DIR)/bemusedlinuxserver endef ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] pulseaudio - gcc bug?
hey, i tried to fix pulseaudio, with more or less success first the patch: Index: /home/openwrt/trunk/package/sound/pulseaudio/Makefile === --- /home/openwrt/trunk/package/sound/pulseaudio/Makefile (revision 10204) +++ /home/openwrt/trunk/package/sound/pulseaudio/Makefile (working copy) @@ -33,13 +33,21 @@ --with-access-group=root \ --without-x \ --enable-static-bins \ + --disable-solaris \ + --disable-glib2 \ + --disable-gconf \ + --disable-lirc \ + --disable-manpages \ + --disable-ltdl-install \ PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig \ LIBOIL_CFLAGS=-I$(STAGING_DIR)/usr/include/liboil-0.3/ \ - LIBOIL_LIBS=-L$(STAGING_DIR)/usr/lib/ \ + LIBOIL_LIBS=-L$(STAGING_DIR)/usr/lib/ -loil-0.3 \ + LIBS=-lrt -lltdl -ldl \ define Build/Compile + LIBTOOL=$(STAGING_DIR)/usr/bin/libtool \ $(MAKE) -C $(PKG_BUILD_DIR) \ - CFLAGS=$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include \ + CFLAGS=$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/liboil-0.3/ \ LDFLAGS=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib \ DESTDIR=$(PKG_INSTALL_DIR) \ X_CFLAGS= \ But when the package tries to link i get this error: ... -Wl,/home/openwrt/trunk/build_dir/mipsel/libsndfile-1.0.17/ipkg-install/usr/lib -Wl,--rpath -Wl,/home/openwrt/trunk/build_dir/mipsel/libsamplerate-0.1.2/ipkg-install/usr/lib -Wl,--rpath -Wl,/home/openwrt/trunk/build_dir/mipsel/libsndfile-1.0.17/ipkg-install/usr/lib -L/home/openwrt/trunk/staging_dir/mipsel/usr/lib -L/home/openwrt/trunk/staging_dir/mipsel/lib -lpthread /home/openwrt/trunk/build_dir/mipsel/libsamplerate-0.1.2/ipkg-install/usr/lib/libsamplerate.so /home/openwrt/trunk/build_dir/mipsel/libsndfile-1.0.17/ipkg-install/usr/lib/libsndfile.so -L/home/openwrt/trunk/staging_dir/mipsel/usr/lib/ -loil-0.3 -lm -lrt -lltdl -ldl -latomic_ops -pthread -mips32 -mtune=mips32 -Wl,-no-undefined -Wl,--gc-sections -Wl,-soname -Wl,libpulsecore.so.5 -o .libs/libpulsecore.so.5.0.0 .libs/libpulsecore_la-thread-mq.o: In function `pa_thread_mq_get': thread-mq.c:(.text+0x18): undefined reference to `__tls_get_addr' .libs/libpulsecore_la-thread-mq.o: In function `pa_thread_mq_install': thread-mq.c:(.text+0x490): undefined reference to `__tls_get_addr' collect2: ld returned 1 exit status make[6]: *** [libpulsecore.la] Error 1 according to http://www.pulseaudio.org/ticket/152 those dev says: this is not a bug in PA, but in your gcc+glibc combo then. Closing this now. someone knows more about this? cheers michu Signed-off-by: Michael Vogt michu at neophob.com ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] openssh enable hostbased auth
ssh-keysign is needed for hostbased authent. cheers michu Signed-off-by: Michael Vogt michu at neophob.com Index: package/net/openssh/Makefile === --- package/net/openssh/Makefile (revision 10172) +++ package/net/openssh/Makefile (working copy) @@ -169,6 +169,7 @@ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-add $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-agent $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-keyscan $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ssh-keysign $(1)/usr/bin/ endef define Package/openssh-server/install ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] new package libshout
libshout package cheers michu Signed-off-by: Michael Vogt michu at neophob.com Index: package/libs/libshout/patches/120-vorbis-c.patch === --- package/libs/libshout/patches/120-vorbis-c.patch (revision 0) +++ package/libs/libshout/patches/120-vorbis-c.patch (revision 0) @@ -0,0 +1,11 @@ +--- libshout-2.2.2/src/vorbis.c.orig 2006-01-31 02:42:42.0 +0100 libshout-2.2.2/src/vorbis.c 2008-02-12 07:59:59.0 +0100 +@@ -27,7 +27,7 @@ + #include inttypes.h + #endif + +-#include vorbis/codec.h ++#include tremor/ivorbiscodec.h + + #include shout_private.h + #include shout_ogg.h Index: package/libs/libshout/patches/100-ogg-c.patch === --- package/libs/libshout/patches/100-ogg-c.patch (revision 0) +++ package/libs/libshout/patches/100-ogg-c.patch (revision 0) @@ -0,0 +1,11 @@ +--- libshout-2.2.2/src/ogg.c.orig 2006-01-31 02:42:42.0 +0100 libshout-2.2.2/src/ogg.c 2008-02-12 07:52:03.0 +0100 +@@ -30,7 +30,7 @@ + #include inttypes.h + #endif + +-#include ogg/ogg.h ++#include tremor/ogg.h + + #include shout/shout.h + #include shout_private.h Index: package/libs/libshout/patches/140-noexample.patch === --- package/libs/libshout/patches/140-noexample.patch (revision 0) +++ package/libs/libshout/patches/140-noexample.patch (revision 0) @@ -0,0 +1,19 @@ +--- libshout-2.2.2/Makefile.in.orig 2006-06-19 22:36:36.0 +0200 libshout-2.2.2/Makefile.in 2008-02-12 08:24:37.0 +0100 +@@ -246,14 +246,14 @@ + target_alias = @target_alias@ + AUTOMAKE_OPTIONS = 1.6 foreign + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = include src examples debian doc win32 ++SUBDIRS = include src debian doc win32 + EXTRA_DIST = INSTALL m4/shout.m4 m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \ + m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \ + m4/xiph_types.m4 + + DISTCLEANFILES = shout-config.in + docdir = $(datadir)/doc/$(PACKAGE) +-doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c ++doc_DATA = COPYING NEWS README + m4datadir = $(datadir)/aclocal + m4data_DATA = m4/shout.m4 + @[EMAIL PROTECTED] = $(libdir)/pkgconfig Index: package/libs/libshout/patches/110-shout-ogg-c.patch === --- package/libs/libshout/patches/110-shout-ogg-c.patch (revision 0) +++ package/libs/libshout/patches/110-shout-ogg-c.patch (revision 0) @@ -0,0 +1,11 @@ +--- libshout-2.2.2/src/shout_ogg.h.orig 2006-01-31 02:42:42.0 +0100 libshout-2.2.2/src/shout_ogg.h 2008-02-12 07:54:46.0 +0100 +@@ -28,7 +28,7 @@ + + #include stdlib.h + +-#include ogg/ogg.h ++#include tremor/ogg.h + + typedef struct _ogg_codec_tag { + ogg_stream_state os; Index: package/libs/libshout/Makefile === --- package/libs/libshout/Makefile (revision 0) +++ package/libs/libshout/Makefile (revision 0) @@ -0,0 +1,70 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# $Id: Makefile 9907 2007-12-25 01:59:55Z nbd $ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libshout +PKG_VERSION:=2.2.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/libshout/ +PKG_MD5SUM:=4f75fc9901c724b712c371c9a1e782d3 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(INCLUDE_DIR)/package.mk + +define Package/libshout + SECTION:=libs + DEPENDS:=+libvorbisidec + CATEGORY:=Libraries + TITLE:=Library which can be used to write a source client like ices + URL:=http://www.icecast.org/download.php +endef + +define Package/libshout/description + libshout allows applications to easily communicate and broadcast + to an Icecast streaming media server. It handles the socket connections, + metadata communication, and data streaming for the calling application, + and lets developers focus on feature sets instead of implementation + details. +endef + +define Build/Configure + $(call Build/Configure/Default, \ + VORBIS_CFLAGS=$(STAGING_DIR)/usr/include/tremor\ + VORBIS_LIBS=$(STAGING_DIR)/usr/lib \ + --enable-shared \ + --enable-static \ + ) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR=$(PKG_INSTALL_DIR) \ + all install +endef + +define Build/InstallDev + mkdir -p $(1)/usr/include/shout + $(CP) $(PKG_INSTALL_DIR)/usr/include/shout/shout.h $(1)/usr/include/shout + mkdir -p $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libshout.{a,so*} $(1)/usr/lib/ + mkdir -p $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/shout.pc $(1)/usr/lib/pkgconfig/ +endef + +define Package/libshout/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP
Re: [OpenWrt-Devel] [PATCH] bluez-utils
hey again i've cleaned up the bluez-util make file. the size of the ipk file is still arround 250kb. about the --disable-all parameter, i guess this will leave bluez utils rather useless, as i think sdpd, hcid is needed. perhaps i could split the package up and remove the hciconfig binary to a seperate package - the binary is 100k uncompressed and the bluez util would shrink to 210kb. what do you think? i think it better to use (or waste..) 250kb of diskspace for a working bluetooth package, instead to waste 150kb diskspace for a non working bluetooth package. as soon as this bluetooth package is commited, ill release bemusedserver - this is a bluetooth app, which connects to the mpd musicplayer. with this app and a java client on your mobile phone, you would be able to controll your mpd with you mobile phone... cheers michu Signed-off-by: Michael Vogt michu at neophob.com I've fixed the dbus ticket and committed all the bluez updates in my local repo, but I'm reluctant to commit the entire set of changes to the OpenWrt svn as the size of the bluez-utils package is jumping from ~140k to ~250k. I've been playing with the configure opts and can drop the size down to ~110k by passing --disable-all, but haven't figured out exactly which extra options are causing the massive size increase. If there are major improvements between 2.24 and 3.24 -- or the modified configure args -- that warrant the extra size increase I'll commit the changesets, otherwise I wonder if staying up to date is worth the potential bloat. -Andy ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel Index: package/utils/bluez-utils/files/bluez-utils.init === --- package/utils/bluez-utils/files/bluez-utils.init (revision 10204) +++ package/utils/bluez-utils/files/bluez-utils.init (working copy) @@ -1,7 +1,8 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2007 OpenWrt.org -START=60 +#start after dbus (60) +START=62 append_bool() { local section=$1 @@ -107,6 +108,16 @@ config_foreach rfcomm_config rfcomm config_foreach dund_config dund config_foreach pand_config pand + +#start passkey agent with default pin 1234 +passkey-agent --default 1234 + +hcitool hci0 up +rfcomm release 0 + +#set up serial conenction +#rfcomm connect /dev/rfcomm0 00:11:22:33:44:55 + } stop() { Index: package/utils/bluez-utils/patches/100-enokey1.patch === --- package/utils/bluez-utils/patches/100-enokey1.patch (revision 0) +++ package/utils/bluez-utils/patches/100-enokey1.patch (revision 0) @@ -0,0 +1,11 @@ +--- bluez-utils-3.24/input/device.orig 2007-12-08 20:04:42.0 +0100 bluez-utils-3.24/input/device.c 2008-01-16 09:20:41.0 +0100 +@@ -25,6 +25,8 @@ + #include config.h + #endif + ++#define ENOKEY 161 /* Required key not available */ ++ + #include stdlib.h + #include errno.h + #include fcntl.h Index: package/utils/bluez-utils/patches/101-enokey1.patch === --- package/utils/bluez-utils/patches/101-enokey1.patch (revision 0) +++ package/utils/bluez-utils/patches/101-enokey1.patch (revision 0) @@ -0,0 +1,11 @@ +--- bluez-utils-3.24/input/storage.orig 2007-10-05 09:17:06.0 +0200 bluez-utils-3.24/input/storage.c 2008-01-16 09:26:23.0 +0100 +@@ -25,6 +25,8 @@ + #include config.h + #endif + ++#define ENOKEY 161 /* Required key not available */ ++ + #include stdio.h + #include errno.h + #include ctype.h Index: package/utils/bluez-utils/Makefile === --- package/utils/bluez-utils/Makefile (revision 10204) +++ package/utils/bluez-utils/Makefile (working copy) @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bluez-utils -PKG_VERSION:=2.24 -PKG_RELEASE:=3 +PKG_VERSION:=3.24 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://bluez.sourceforge.net/download -PKG_MD5SUM:=5f5488ff3d31bdb9cd36b7991fe68408 +PKG_MD5SUM:=cc3582da827bc4c468147af1afaa5aff PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install @@ -24,35 +24,25 @@ define Package/bluez-utils SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+bluez-libs +libpthread + DEPENDS:=+bluez-libs +libpthread +dbus TITLE:=Bluetooth utilities URL:=http://www.bluez.org/ endef define Package/bluez-utils/conffiles -/etc/bluetooth/givepin /etc/bluetooth/hcid.conf /etc/bluetooth/rfcomm.conf /etc/config/bluetooth endef + define Build/Configure $(call Build/Configure/Default, \ - --disable-dbus \ - --disable-fuse \ - --disable-obex \ - --disable-alsa
[OpenWrt-Devel] [PATCH] scmpc - depends on correct system time
scmpc is a daemon which submits songs (its metadata) to last.fm. this works only if the system time is correct. is it possible to add or dependence's? something like DEPENDS:=+libcurl +libdaemon +argtable +confuse +(openntpd||ntpcliennt||htpdate||chrony) ? cheers Signed-off-by: Michael Vogt michu at neophob.com --- Index: package/sound/scmpc/Makefile === --- package/sound/scmpc/Makefile(revision 10204) +++ package/sound/scmpc/Makefile(working copy) @@ -25,7 +25,7 @@ SECTION:=sound CATEGORY:=Sound TITLE:=A MPD client which submits your tracks to Last.Fm - DEPENDS:=+libcurl +libdaemon +argtable +confuse + DEPENDS:=+libcurl +libdaemon +argtable +confuse +openntpd URL:=http://scmpc.berlios.de/ endef ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] bluez-utils
hey andy according to the bluez web site the 2.x driver series are out of date: The 2.x series of libraries and packages is officially deprecated and also unsupported. The download link is only provided for reference. i'm really not an bluetooth expert, but as far as i know those parts are needed: hcid - the low level daemon sdpd - service discovery daemon passkey-agent - used for pin stuff other features are rather small (~10k) like the bluetooth net stuff. my opinion is, when you use bluetooth, you have a system with (most likely) usb conenctors and chances are high that those devices use at least 8mb of rom... i know its a bit a funny reason... anyway, the dbus patch you may commit safely, as the current dbus version will not work. michu Quoting Andy Boyett [EMAIL PROTECTED]: I've fixed the dbus ticket and committed all the bluez updates in my local repo, but I'm reluctant to commit the entire set of changes to the OpenWrt svn as the size of the bluez-utils package is jumping from ~140k to ~250k. I've been playing with the configure opts and can drop the size down to ~110k by passing --disable-all, but haven't figured out exactly which extra options are causing the massive size increase. If there are major improvements between 2.24 and 3.24 -- or the modified configure args -- that warrant the extra size increase I'll commit the changesets, otherwise I wonder if staying up to date is worth the potential bloat. -Andy ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel