From 081c4893ec1e543c2ceffe372e1986dda89c91af Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 14 Aug 2005 19:12:58 +0000 Subject: Added wireless-tools to feed --- packages/meta/openslug-packages.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 16240ff4e9..683b9ada96 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -113,6 +113,7 @@ OPENSLUG_PACKAGES = "\ vlan \ wakelan \ watchdog \ + wireless-tools \ wget \ xinetd \ yp-tools ypbind ypserv \ -- cgit v1.2.3 From 679590f93844a86c5611033841923a4e0964b742 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 14 Aug 2005 19:31:56 +0000 Subject: Added zd1211 driver to feed --- packages/meta/openslug-packages.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 683b9ada96..36a7836683 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -117,6 +117,7 @@ OPENSLUG_PACKAGES = "\ wget \ xinetd \ yp-tools ypbind ypserv \ + zd1211 \ zlib \ " -- cgit v1.2.3 From 726c2bf207d0b7894109efe82842cc52b8243904 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 14 Aug 2005 20:02:52 +0000 Subject: Add asterisk 1.0.9, delete 1.0.9 --- packages/asterisk/asterisk-1.0.7/.mtn2git_empty | 0 packages/asterisk/asterisk-1.0.7/makefile.patch | 371 ------------------------ packages/asterisk/asterisk-1.0.9/.mtn2git_empty | 0 packages/asterisk/asterisk-1.0.9/gsm.patch | 71 +++++ packages/asterisk/asterisk-1.0.9/makefile.patch | 311 ++++++++++++++++++++ packages/asterisk/asterisk_1.0.7.bb | 23 -- packages/asterisk/asterisk_1.0.9.bb | 24 ++ packages/gnome/gnome-desktop_2.10.2.bb | 2 +- 8 files changed, 407 insertions(+), 395 deletions(-) delete mode 100644 packages/asterisk/asterisk-1.0.7/.mtn2git_empty delete mode 100644 packages/asterisk/asterisk-1.0.7/makefile.patch create mode 100644 packages/asterisk/asterisk-1.0.9/.mtn2git_empty create mode 100644 packages/asterisk/asterisk-1.0.9/gsm.patch create mode 100644 packages/asterisk/asterisk-1.0.9/makefile.patch delete mode 100644 packages/asterisk/asterisk_1.0.7.bb create mode 100644 packages/asterisk/asterisk_1.0.9.bb (limited to 'packages') diff --git a/packages/asterisk/asterisk-1.0.7/.mtn2git_empty b/packages/asterisk/asterisk-1.0.7/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/asterisk/asterisk-1.0.7/makefile.patch b/packages/asterisk/asterisk-1.0.7/makefile.patch deleted file mode 100644 index 2eea89636d..0000000000 --- a/packages/asterisk/asterisk-1.0.7/makefile.patch +++ /dev/null @@ -1,371 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- asterisk-1.0.7/Makefile~makefile.patch -+++ asterisk-1.0.7/Makefile -@@ -127,64 +127,67 @@ - AGI_DIR=$(ASTVARLIBDIR)/agi-bin - - INCLUDE=-Iinclude -I../include --CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY --CFLAGS+=$(OPTIMIZE) -+my_CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+my_CFLAGS+=$(OPTIMIZE) - - ifneq ($(PROC),ultrasparc) --CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) -+my_CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) - endif - --CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi) --CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi) -+my_CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi) -+my_CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi) - - ifeq (${OSARCH},FreeBSD) - OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) --CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) -+my_CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) - LIBS+=$(shell if test ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) - INCLUDE+=-I/usr/local/include --CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi) -+my_CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi) - MPG123TARG=freebsd - endif # FreeBSD - - ifeq (${OSARCH},NetBSD) --CFLAGS+=-pthread -+my_CFLAGS+=-pthread - INCLUDE+=-I/usr/local/include -I/usr/pkg/include - MPG123TARG=netbsd - endif - - ifeq (${OSARCH},OpenBSD) --CFLAGS+=-pthread -+my_CFLAGS+=-pthread - endif - - #Uncomment this to use the older DSP routines - #CFLAGS+=-DOLD_DSP_ROUTINES - --CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) --CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) -+my_CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) -+my_CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) - - LIBEDIT=editline/libedit.a - - ASTERISKVERSION=$(shell if [ -f .version ]; then cat .version; else if [ -d CVS ]; then if [ -f CVS/Tag ] ; then echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`"; else echo "CVS-HEAD-`date +"%D-%T"`"; fi; fi; fi) - HTTPDIR=$(shell if [ -d /var/www ]; then echo "/var/www"; else echo "/home/httpd"; fi) - RPMVERSION=$(shell if [ -f .version ]; then sed 's/[-\/:]/_/g' .version; else echo "unknown" ; fi) --CFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\" --CFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" --CFLAGS+=-DASTETCDIR=\"$(ASTETCDIR)\" --CFLAGS+=-DASTLIBDIR=\"$(ASTLIBDIR)\" --CFLAGS+=-DASTVARLIBDIR=\"$(ASTVARLIBDIR)\" --CFLAGS+=-DASTVARRUNDIR=\"$(ASTVARRUNDIR)\" --CFLAGS+=-DASTSPOOLDIR=\"$(ASTSPOOLDIR)\" --CFLAGS+=-DASTLOGDIR=\"$(ASTLOGDIR)\" --CFLAGS+=-DASTCONFPATH=\"$(ASTCONFPATH)\" --CFLAGS+=-DASTMODDIR=\"$(MODULES_DIR)\" --CFLAGS+=-DASTAGIDIR=\"$(AGI_DIR)\" -+my_CFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\" -+my_CFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" -+my_CFLAGS+=-DASTETCDIR=\"$(ASTETCDIR)\" -+my_CFLAGS+=-DASTLIBDIR=\"$(ASTLIBDIR)\" -+my_CFLAGS+=-DASTVARLIBDIR=\"$(ASTVARLIBDIR)\" -+my_CFLAGS+=-DASTVARRUNDIR=\"$(ASTVARRUNDIR)\" -+my_CFLAGS+=-DASTSPOOLDIR=\"$(ASTSPOOLDIR)\" -+my_CFLAGS+=-DASTLOGDIR=\"$(ASTLOGDIR)\" -+my_CFLAGS+=-DASTCONFPATH=\"$(ASTCONFPATH)\" -+my_CFLAGS+=-DASTMODDIR=\"$(MODULES_DIR)\" -+my_CFLAGS+=-DASTAGIDIR=\"$(AGI_DIR)\" -+ -+my_CFLAGS+= $(DEBUG_THREADS) -+my_CFLAGS+= $(TRACE_FRAMES) -+my_CFLAGS+= $(MALLOC_DEBUG) -+my_CFLAGS+= $(BUSYDETECT) -+my_CFLAGS+= $(OPTIONS) -+my_CFLAGS+=# -fomit-frame-pointer -+ -+override CFLAGS += $(my_CFLAGS) - --CFLAGS+= $(DEBUG_THREADS) --CFLAGS+= $(TRACE_FRAMES) --CFLAGS+= $(MALLOC_DEBUG) --CFLAGS+= $(BUSYDETECT) --CFLAGS+= $(OPTIONS) --CFLAGS+=# -fomit-frame-pointer - SUBDIRS=res channels pbx apps codecs formats agi cdr astman stdtime - ifeq (${OSARCH},Linux) - LIBS=-ldl -lpthread -@@ -296,7 +299,7 @@ - fi - - asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) -- $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) -+ $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS) - - muted: muted.o - $(CC) -o muted muted.o ---- asterisk-1.0.7/res/Makefile~makefile.patch -+++ asterisk-1.0.7/res/Makefile -@@ -13,15 +13,13 @@ - - MODS=res_adsi.so res_features.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so \ - res_agi.so --MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) --MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) --MODS+=$(shell if [ -f "/usr/include/osp/osp.h" ]; then echo "res_osp.so"; fi) -+MODS+=$(shell if [ -f "${STAGING_INCDIR}/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) -+MODS+=$(shell if [ -f "${STAGING_INCDIR}/osp/osp.h" ]; then echo "res_osp.so"; fi) - - CRYPTO_LIBS=-lssl -lcrypto - - CFLAGS+= --CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH") -+CFLAGS+=$(shell [ -f ${STAGING_INCDIR}/linux/zaptel.h ] && echo " -DZAPATA_MOH") - # - # Work around buggy RedHat 9.0 - # -@@ -37,7 +35,7 @@ - for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done - - res_crypto.so: res_crypto.o -- $(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS) -+ $(CC) $(SOLINK) -o $@ $< $(LDFLAGS) $(CRYPTO_LIBS) - - clean: - rm -f *.so *.o .depend ---- asterisk-1.0.7/channels/Makefile~makefile.patch -+++ asterisk-1.0.7/channels/Makefile -@@ -71,22 +71,20 @@ - CHANNEL_LIBS+=chan_oss.so - endif - --CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so) --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so) -+CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/linux/ixjuser.h ] && echo chan_phone.so) - CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so) - - CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations --CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") --CHANNEL_LIBS+=$(shell [ -f /usr/include/alsa/asoundlib.h ] && echo "chan_alsa.so") --CFLAGS+=$(shell [ -f /usr/lib/libpri.so.1 ] && echo " -DZAPATA_PRI") --CFLAGS+=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo " -DZAPATA_R2") -+CFLAGS+=$(shell [ ! -f ${STAGING_INCDIR}/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") -+CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/alsa/asoundlib.h ] && echo "chan_alsa.so") -+CFLAGS+=$(shell [ -f ${STAGING_LIBDIR}/libpri.so.1 ] && echo " -DZAPATA_PRI") -+CFLAGS+=$(shell [ -f ${STAGING_LIBDIR}/libmfcr2.so.1 ] && echo " -DZAPATA_R2") - CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR") --ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri") --ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2") --CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING") --CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING") --CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" ) --CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX") -+ZAPPRI=$(shell [ -f ${STAGING_LIBDIR}/libpri.so.1 ] && echo "-lpri") -+ZAPR2=$(shell [ -f ${STAGING_LIBDIR}/libmfcr2.so.1 ] && echo "-lmfcr2") -+CFLAGS+=$(shell [ -f ${STAGING_INCDIR}/linux/zaptel.h ] && echo "-DIAX_TRUNKING") -+CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/vpbapi.h ] && echo "chan_vpb.so" ) -+CFLAGS+=$(shell [ -f ${STAGING_INCDIR}/vpbapi.h ] && echo " -DLINUX") - - ALSA_SRC=chan_alsa.c - ALSA_SRC+=$(shell [ -f alsa-monitor.h ] && echo "alsa-monitor.h") -@@ -106,10 +104,9 @@ - - ZAPDIR=/usr/lib - --CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so") --CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so") -+CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/linux/zaptel.h ] && echo "chan_zap.so") - --CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" ) -+CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/nbs.h ] && echo "chan_nbs.so" ) - - ifndef OPENH323DIR - OPENH323DIR=$(HOME)/openh323 -@@ -135,10 +132,10 @@ - endif - - gentone: gentone.c -- $(CC) -o gentone gentone.c -lm -+ $(BUILD_CC) -o gentone gentone.c -lm - - gentone-ulaw: gentone-ulaw.c -- $(CC) -o gentone-ulaw gentone-ulaw.c -lm -+ $(BUILD_CC) -o gentone-ulaw gentone-ulaw.c -lm - - busy.h: gentone - ./gentone busy 480 620 ---- asterisk-1.0.7/pbx/Makefile~makefile.patch -+++ asterisk-1.0.7/pbx/Makefile -@@ -16,7 +16,7 @@ - PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so # pbx_gtkconsole.so pbx_kdeconsole.so - - # Add GTK console if appropriate --PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") -+PBX_LIBS+=$(shell ${STAGING_BINDIR}/gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - ---- asterisk-1.0.7/codecs/gsm/Makefile~makefile.patch -+++ asterisk-1.0.7/codecs/gsm/Makefile -@@ -37,20 +37,6 @@ - ######### ppro's, etc, as well as the AMD K6 and K7. The compile will - ######### probably require gcc. - --ifneq (${OSARCH},Darwin) --ifneq (${PROC},x86_64) --ifneq (${PROC},ultrasparc) --ifneq ($(shell uname -m),ppc) --ifneq ($(shell uname -m),alpha) --ifneq (${PROC},sparc64) --OPTIMIZE+=-march=$(PROC) --endif --endif --endif --endif --endif --endif -- - #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. - #This works for even old (2.96) versions of gcc and provides a small boost either way. - #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it. -@@ -212,17 +198,6 @@ - $(SRC)/gsm_option.c \ - $(SRC)/short_term.c \ - $(SRC)/table.c --ifeq (${OSARCH},Linux) --ifneq ($(shell uname -m),x86_64) --ifneq ($(shell uname -m),ppc) --ifneq ($(shell uname -m),alpha) --ifneq ($(shell uname -m),sparc64) --GSM_SOURCES+= $(SRC)/k6opt.s --endif --endif --endif --endif --endif - - TOAST_SOURCES = $(SRC)/toast.c \ - $(SRC)/toast_lin.c \ -@@ -268,18 +243,6 @@ - $(SRC)/short_term.o \ - $(SRC)/table.o - --ifeq (${OSARCH},Linux) --ifneq ($(shell uname -m), x86_64) --ifneq ($(shell uname -m), ppc) --ifneq ($(shell uname -m), alpha) --ifneq ($(shell uname -m), sparc64) --GSM_OBJECTS+= $(SRC)/k6opt.o --endif --endif --endif --endif --endif -- - TOAST_OBJECTS = $(SRC)/toast.o \ - $(SRC)/toast_lin.o \ - $(SRC)/toast_ulaw.o \ ---- asterisk-1.0.7/codecs/lpc10/Makefile~makefile.patch -+++ asterisk-1.0.7/codecs/lpc10/Makefile -@@ -25,28 +25,6 @@ - CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC - #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi) - --#fix for PPC processors and ALPHA, And UltraSparc too --ifneq ($(OSARCH),Darwin) --ifneq ($(findstring BSD,${OSARCH}),BSD) --ifneq ($(PROC),ppc) --ifneq ($(PROC),x86_64) --ifneq ($(PROC),alpha) --#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. --#This works for even old (2.96) versions of gcc and provides a small boost either way. --#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it. --#So we go lowest common available by gcc and go a step down, still a step up from --#the default as we now have a better instruction set to work with. - Belgarath --ifeq ($(PROC),ultrasparc) -- CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer --else -- CFLAGS+= -march=$(PROC) --endif --endif --endif --endif --endif --endif -- - LIB = $(LIB_TARGET_DIR)/liblpc10.a - - .PHONY: all clean ---- asterisk-1.0.7/cdr/Makefile~makefile.patch -+++ asterisk-1.0.7/cdr/Makefile -@@ -37,36 +37,25 @@ - # - # unixODBC stuff... - # --MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "cdr_odbc.so"; fi) --MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "cdr_odbc.so"; fi) -+MODS+=$(shell if [ -f "${STAGING_INCDIR}/odbcinst.h" ]; then echo "cdr_odbc.so"; fi) - - # - # FreeTDS stuff... - # --MODS+=$(shell if [ -f "/usr/include/tds.h" ]; then echo "cdr_tds.so"; fi) --MODS+=$(shell if [ -f "/usr/local/include/tds.h" ]; then echo "cdr_tds.so"; fi) -+MODS+=$(shell if [ -f "${STAGING_INCDIR}/tds.h" ]; then echo "cdr_tds.so"; fi) - - # - # PGSQL stuff... Autoconf anyone?? - # --MODS+=$(shell if [ -d /usr/local/pgsql/include ] || [ -d /usr/include/pgsql ] || [ -d /usr/local/include/pgsql ] || [ -d /opt/pgsql/include ] || [ -f /usr/include/libpq-fe.h ] ; then echo "cdr_pgsql.so"; fi) --CFLAGS+=$(shell if [ -d /usr/local/pgsql/include ]; then echo "-I/usr/local/pgsql/include"; fi) --CFLAGS+=$(shell if [ -d /usr/include/pgsql ]; then echo "-I/usr/include/pgsql"; fi) --CFLAGS+=$(shell if [ -d /usr/include/postgresql ]; then echo "-I/usr/include/postgresql"; fi) --CFLAGS+=$(shell if [ -d /usr/local/include/pgsql ]; then echo "-I/usr/local/include/pgsql"; fi) --CFLAGS+=$(shell if [ -d /opt/pgsql/include ]; then echo "-I/opt/pgsql/include"; fi) --#CFLAGS+=$(shell if [ -f /usr/include/libpq-fe.h ]; then echo "-I/usr/include"; fi) -+CFLAGS+=$(shell if [ -d ${STAGING_INCDIR}/pgsql ]; then echo "-I${STAGING_INCDIR}/pgsql"; fi) -+CFLAGS+=$(shell if [ -d ${STAGING_INCDIR}/postgresql ]; then echo "-I${STAGING_INCDIR}/postgresql"; fi) - MLFLAGS= --MLFLAGS+=$(shell if [ -d /usr/lib/pgsql ]; then echo "-L/usr/lib/pgsql"; fi) --MLFLAGS+=$(shell if [ -d /usr/local/pgsql/lib ]; then echo "-L/usr/local/pgsql/lib"; fi) --MLFLAGS+=$(shell if [ -d /usr/local/lib/pgsql ]; then echo "-L/usr/local/lib/pgsql"; fi) --MLFLAGS+=$(shell if [ -d /opt/pgsql/lib ]; then echo "-L/opt/pgsql/lib"; fi) --MLFLAGS+=$(shell if [ -f /usr/lib/libpq.so ]; then echo "-L/usr/lib"; fi) -+MLFLAGS+=$(shell if [ -d ${STAGING_LIBDIR}/pgsql ]; then echo "-L${STAGING_LIBDIR}/pgsql"; fi) - - # - # SQLIte stuff... - # --MODS+=$(shell if [ -f "/usr/include/sqlite.h" ]; then echo "cdr_sqlite.so"; fi) -+MODS+=$(shell if [ -f "${STAGING_INCDIR}/sqlite.h" ]; then echo "cdr_sqlite.so"; fi) - - all: depend $(MODS) - -@@ -84,16 +73,16 @@ - endif - - cdr_odbc.so: cdr_odbc.o -- $(CC) $(SOLINK) -o $@ $< -lodbc $(MLFLAGS) -+ $(CC) $(SOLINK) -o $@ $< -lodbc $(LDFLAGS) $$(MLFLAGS) - - cdr_tds.so: cdr_tds.o -- $(CC) $(SOLINK) -o $@ $< -ltds $(MLFLAGS) -+ $(CC) $(SOLINK) -o $@ $< -ltds $(LDFLAGS) $$(MLFLAGS) - - cdr_pgsql.so: cdr_pgsql.o -- $(CC) $(SOLINK) -o $@ $< -lpq -lz $(MLFLAGS) -+ $(CC) $(SOLINK) -o $@ $< -lpq -lz $(LDFLAGS) $$(MLFLAGS) - - cdr_sqlite.so: cdr_sqlite.o -- $(CC) $(SOLINK) -o $@ $< -lsqlite $(MLFLAGS) -+ $(CC) $(SOLINK) -o $@ $< -lsqlite $(LDFLAGS) $(MLFLAGS) - - depend: .depend - diff --git a/packages/asterisk/asterisk-1.0.9/.mtn2git_empty b/packages/asterisk/asterisk-1.0.9/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/asterisk/asterisk-1.0.9/gsm.patch b/packages/asterisk/asterisk-1.0.9/gsm.patch new file mode 100644 index 0000000000..c59aa80bba --- /dev/null +++ b/packages/asterisk/asterisk-1.0.9/gsm.patch @@ -0,0 +1,71 @@ +--- asterisk-1.0.9.org/codecs/gsm/Makefile 2005-06-21 16:27:28.000000000 +0200 ++++ asterisk-1.0.9/codecs/gsm/Makefile 2005-08-14 21:47:10.000000000 +0200 +@@ -37,26 +37,6 @@ + ######### ppro's, etc, as well as the AMD K6 and K7. The compile will + ######### probably require gcc. + +-ifneq (${OSARCH},Darwin) +-ifneq (${PROC},x86_64) +-ifneq (${PROC},ultrasparc) +-ifneq ($(shell uname -m),ppc) +-ifneq ($(shell uname -m),alpha) +-ifneq ($(shell uname -m),armv4l) +-ifneq (${PROC},sparc64) +-ifneq (${PROC},ppc) +-ifneq (${PROC},ppc64) +-OPTIMIZE+=-march=$(PROC) +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +- + #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. + #This works for even old (2.96) versions of gcc and provides a small boost either way. + #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it. +@@ -218,19 +198,6 @@ + $(SRC)/gsm_option.c \ + $(SRC)/short_term.c \ + $(SRC)/table.c +-ifeq (${OSARCH},Linux) +-ifneq ($(shell uname -m),x86_64) +-ifneq ($(shell uname -m),ppc) +-ifneq ($(shell uname -m),alpha) +-ifneq ($(shell uname -m),armv4l) +-ifneq ($(shell uname -m),sparc64) +-GSM_SOURCES+= $(SRC)/k6opt.s +-endif +-endif +-endif +-endif +-endif +-endif + + TOAST_SOURCES = $(SRC)/toast.c \ + $(SRC)/toast_lin.c \ +@@ -276,20 +243,6 @@ + $(SRC)/short_term.o \ + $(SRC)/table.o + +-ifeq (${OSARCH},Linux) +-ifneq ($(shell uname -m), x86_64) +-ifneq ($(shell uname -m), ppc) +-ifneq ($(shell uname -m), alpha) +-ifneq ($(shell uname -m), armv4l) +-ifneq ($(shell uname -m), sparc64) +-GSM_OBJECTS+= $(SRC)/k6opt.o +-endif +-endif +-endif +-endif +-endif +-endif +- + TOAST_OBJECTS = $(SRC)/toast.o \ + $(SRC)/toast_lin.o \ + $(SRC)/toast_ulaw.o \ + diff --git a/packages/asterisk/asterisk-1.0.9/makefile.patch b/packages/asterisk/asterisk-1.0.9/makefile.patch new file mode 100644 index 0000000000..066fb677dc --- /dev/null +++ b/packages/asterisk/asterisk-1.0.9/makefile.patch @@ -0,0 +1,311 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- asterisk-1.0.7/Makefile~makefile.patch ++++ asterisk-1.0.7/Makefile +@@ -127,64 +127,67 @@ + AGI_DIR=$(ASTVARLIBDIR)/agi-bin + + INCLUDE=-Iinclude -I../include +-CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY +-CFLAGS+=$(OPTIMIZE) ++my_CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY ++my_CFLAGS+=$(OPTIMIZE) + + ifneq ($(PROC),ultrasparc) +-CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) ++my_CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) + endif + +-CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi) +-CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi) ++my_CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi) ++my_CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi) + + ifeq (${OSARCH},FreeBSD) + OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) +-CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) ++my_CFLAGS+=$(shell if test ${OSVERSION} -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) + LIBS+=$(shell if test ${OSVERSION} -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi) + INCLUDE+=-I/usr/local/include +-CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi) ++my_CFLAGS+=$(shell if [ -d /usr/local/include/spandsp ]; then echo "-I/usr/local/include/spandsp"; fi) + MPG123TARG=freebsd + endif # FreeBSD + + ifeq (${OSARCH},NetBSD) +-CFLAGS+=-pthread ++my_CFLAGS+=-pthread + INCLUDE+=-I/usr/local/include -I/usr/pkg/include + MPG123TARG=netbsd + endif + + ifeq (${OSARCH},OpenBSD) +-CFLAGS+=-pthread ++my_CFLAGS+=-pthread + endif + + #Uncomment this to use the older DSP routines + #CFLAGS+=-DOLD_DSP_ROUTINES + +-CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) +-CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) ++my_CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) ++my_CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) + + LIBEDIT=editline/libedit.a + + ASTERISKVERSION=$(shell if [ -f .version ]; then cat .version; else if [ -d CVS ]; then if [ -f CVS/Tag ] ; then echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`"; else echo "CVS-HEAD-`date +"%D-%T"`"; fi; fi; fi) + HTTPDIR=$(shell if [ -d /var/www ]; then echo "/var/www"; else echo "/home/httpd"; fi) + RPMVERSION=$(shell if [ -f .version ]; then sed 's/[-\/:]/_/g' .version; else echo "unknown" ; fi) +-CFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\" +-CFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" +-CFLAGS+=-DASTETCDIR=\"$(ASTETCDIR)\" +-CFLAGS+=-DASTLIBDIR=\"$(ASTLIBDIR)\" +-CFLAGS+=-DASTVARLIBDIR=\"$(ASTVARLIBDIR)\" +-CFLAGS+=-DASTVARRUNDIR=\"$(ASTVARRUNDIR)\" +-CFLAGS+=-DASTSPOOLDIR=\"$(ASTSPOOLDIR)\" +-CFLAGS+=-DASTLOGDIR=\"$(ASTLOGDIR)\" +-CFLAGS+=-DASTCONFPATH=\"$(ASTCONFPATH)\" +-CFLAGS+=-DASTMODDIR=\"$(MODULES_DIR)\" +-CFLAGS+=-DASTAGIDIR=\"$(AGI_DIR)\" ++my_CFLAGS+=-DASTERISK_VERSION=\"$(ASTERISKVERSION)\" ++my_CFLAGS+=-DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" ++my_CFLAGS+=-DASTETCDIR=\"$(ASTETCDIR)\" ++my_CFLAGS+=-DASTLIBDIR=\"$(ASTLIBDIR)\" ++my_CFLAGS+=-DASTVARLIBDIR=\"$(ASTVARLIBDIR)\" ++my_CFLAGS+=-DASTVARRUNDIR=\"$(ASTVARRUNDIR)\" ++my_CFLAGS+=-DASTSPOOLDIR=\"$(ASTSPOOLDIR)\" ++my_CFLAGS+=-DASTLOGDIR=\"$(ASTLOGDIR)\" ++my_CFLAGS+=-DASTCONFPATH=\"$(ASTCONFPATH)\" ++my_CFLAGS+=-DASTMODDIR=\"$(MODULES_DIR)\" ++my_CFLAGS+=-DASTAGIDIR=\"$(AGI_DIR)\" ++ ++my_CFLAGS+= $(DEBUG_THREADS) ++my_CFLAGS+= $(TRACE_FRAMES) ++my_CFLAGS+= $(MALLOC_DEBUG) ++my_CFLAGS+= $(BUSYDETECT) ++my_CFLAGS+= $(OPTIONS) ++my_CFLAGS+=# -fomit-frame-pointer ++ ++override CFLAGS += $(my_CFLAGS) + +-CFLAGS+= $(DEBUG_THREADS) +-CFLAGS+= $(TRACE_FRAMES) +-CFLAGS+= $(MALLOC_DEBUG) +-CFLAGS+= $(BUSYDETECT) +-CFLAGS+= $(OPTIONS) +-CFLAGS+=# -fomit-frame-pointer + SUBDIRS=res channels pbx apps codecs formats agi cdr astman stdtime + ifeq (${OSARCH},Linux) + LIBS=-ldl -lpthread +@@ -296,7 +299,7 @@ + fi + + asterisk: editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS) +- $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS) ++ $(CC) $(DEBUG) -o asterisk $(ASTLINK) $(OBJS) $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LDFLAGS) $(LIBS) + + muted: muted.o + $(CC) -o muted muted.o +--- asterisk-1.0.7/res/Makefile~makefile.patch ++++ asterisk-1.0.7/res/Makefile +@@ -13,15 +13,13 @@ + + MODS=res_adsi.so res_features.so res_crypto.so res_musiconhold.so res_indications.so res_monitor.so \ + res_agi.so +-MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) +-MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) +-MODS+=$(shell if [ -f "/usr/include/osp/osp.h" ]; then echo "res_osp.so"; fi) ++MODS+=$(shell if [ -f "${STAGING_INCDIR}/odbcinst.h" ]; then echo "res_odbc.so res_config_odbc.so"; fi) ++MODS+=$(shell if [ -f "${STAGING_INCDIR}/osp/osp.h" ]; then echo "res_osp.so"; fi) + + CRYPTO_LIBS=-lssl -lcrypto + + CFLAGS+= +-CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo " -DZAPATA_MOH") +-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo " -DZAPATA_MOH") ++CFLAGS+=$(shell [ -f ${STAGING_INCDIR}/linux/zaptel.h ] && echo " -DZAPATA_MOH") + # + # Work around buggy RedHat 9.0 + # +@@ -37,7 +35,7 @@ + for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done + + res_crypto.so: res_crypto.o +- $(CC) $(SOLINK) -o $@ $< $(CRYPTO_LIBS) ++ $(CC) $(SOLINK) -o $@ $< $(LDFLAGS) $(CRYPTO_LIBS) + + clean: + rm -f *.so *.o .depend +--- asterisk-1.0.7/channels/Makefile~makefile.patch ++++ asterisk-1.0.7/channels/Makefile +@@ -71,22 +71,20 @@ + CHANNEL_LIBS+=chan_oss.so + endif + +-CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so) +-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/ixjuser.h ] && echo chan_phone.so) ++CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/linux/ixjuser.h ] && echo chan_phone.so) + CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so) + + CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations +-CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") +-CHANNEL_LIBS+=$(shell [ -f /usr/include/alsa/asoundlib.h ] && echo "chan_alsa.so") +-CFLAGS+=$(shell [ -f /usr/lib/libpri.so.1 ] && echo " -DZAPATA_PRI") +-CFLAGS+=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo " -DZAPATA_R2") ++CFLAGS+=$(shell [ ! -f ${STAGING_INCDIR}/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API") ++CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/alsa/asoundlib.h ] && echo "chan_alsa.so") ++CFLAGS+=$(shell [ -f ${STAGING_LIBDIR}/libpri.so.1 ] && echo " -DZAPATA_PRI") ++CFLAGS+=$(shell [ -f ${STAGING_LIBDIR}/libmfcr2.so.1 ] && echo " -DZAPATA_R2") + CFLAGS+=$(shell [ -f alsa-monitor.h ] && echo " -DALSA_MONITOR") +-ZAPPRI=$(shell [ -f /usr/lib/libpri.so.1 ] && echo "-lpri") +-ZAPR2=$(shell [ -f /usr/lib/libmfcr2.so.1 ] && echo "-lmfcr2") +-CFLAGS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "-DIAX_TRUNKING") +-CFLAGS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "-DIAX_TRUNKING") +-CHANNEL_LIBS+=$(shell [ -f /usr/include/vpbapi.h ] && echo "chan_vpb.so" ) +-CFLAGS+=$(shell [ -f /usr/include/vpbapi.h ] && echo " -DLINUX") ++ZAPPRI=$(shell [ -f ${STAGING_LIBDIR}/libpri.so.1 ] && echo "-lpri") ++ZAPR2=$(shell [ -f ${STAGING_LIBDIR}/libmfcr2.so.1 ] && echo "-lmfcr2") ++CFLAGS+=$(shell [ -f ${STAGING_INCDIR}/linux/zaptel.h ] && echo "-DIAX_TRUNKING") ++CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/vpbapi.h ] && echo "chan_vpb.so" ) ++CFLAGS+=$(shell [ -f ${STAGING_INCDIR}/vpbapi.h ] && echo " -DLINUX") + + ALSA_SRC=chan_alsa.c + ALSA_SRC+=$(shell [ -f alsa-monitor.h ] && echo "alsa-monitor.h") +@@ -106,10 +104,9 @@ + + ZAPDIR=/usr/lib + +-CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/zaptel.h ] && echo "chan_zap.so") +-CHANNEL_LIBS+=$(shell [ -f /usr/local/include/zaptel.h ] && echo "chan_zap.so") ++CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/linux/zaptel.h ] && echo "chan_zap.so") + +-CHANNEL_LIBS+=$(shell [ -f /usr/include/nbs.h ] && echo "chan_nbs.so" ) ++CHANNEL_LIBS+=$(shell [ -f ${STAGING_INCDIR}/nbs.h ] && echo "chan_nbs.so" ) + + ifndef OPENH323DIR + OPENH323DIR=$(HOME)/openh323 +@@ -135,10 +132,10 @@ + endif + + gentone: gentone.c +- $(CC) -o gentone gentone.c -lm ++ $(BUILD_CC) -o gentone gentone.c -lm + + gentone-ulaw: gentone-ulaw.c +- $(CC) -o gentone-ulaw gentone-ulaw.c -lm ++ $(BUILD_CC) -o gentone-ulaw gentone-ulaw.c -lm + + busy.h: gentone + ./gentone busy 480 620 +--- asterisk-1.0.7/pbx/Makefile~makefile.patch ++++ asterisk-1.0.7/pbx/Makefile +@@ -16,7 +16,7 @@ + PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so # pbx_gtkconsole.so pbx_kdeconsole.so + + # Add GTK console if appropriate +-PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") ++PBX_LIBS+=$(shell ${STAGING_BINDIR}/gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") + # Add KDE Console if appropriate + #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") + +--- asterisk-1.0.7/codecs/lpc10/Makefile~makefile.patch ++++ asterisk-1.0.7/codecs/lpc10/Makefile +@@ -25,28 +25,6 @@ + CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC + #CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi) + +-#fix for PPC processors and ALPHA, And UltraSparc too +-ifneq ($(OSARCH),Darwin) +-ifneq ($(findstring BSD,${OSARCH}),BSD) +-ifneq ($(PROC),ppc) +-ifneq ($(PROC),x86_64) +-ifneq ($(PROC),alpha) +-#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. +-#This works for even old (2.96) versions of gcc and provides a small boost either way. +-#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it. +-#So we go lowest common available by gcc and go a step down, still a step up from +-#the default as we now have a better instruction set to work with. - Belgarath +-ifeq ($(PROC),ultrasparc) +- CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer +-else +- CFLAGS+= -march=$(PROC) +-endif +-endif +-endif +-endif +-endif +-endif +- + LIB = $(LIB_TARGET_DIR)/liblpc10.a + + .PHONY: all clean +--- asterisk-1.0.7/cdr/Makefile~makefile.patch ++++ asterisk-1.0.7/cdr/Makefile +@@ -37,36 +37,25 @@ + # + # unixODBC stuff... + # +-MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "cdr_odbc.so"; fi) +-MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "cdr_odbc.so"; fi) ++MODS+=$(shell if [ -f "${STAGING_INCDIR}/odbcinst.h" ]; then echo "cdr_odbc.so"; fi) + + # + # FreeTDS stuff... + # +-MODS+=$(shell if [ -f "/usr/include/tds.h" ]; then echo "cdr_tds.so"; fi) +-MODS+=$(shell if [ -f "/usr/local/include/tds.h" ]; then echo "cdr_tds.so"; fi) ++MODS+=$(shell if [ -f "${STAGING_INCDIR}/tds.h" ]; then echo "cdr_tds.so"; fi) + + # + # PGSQL stuff... Autoconf anyone?? + # +-MODS+=$(shell if [ -d /usr/local/pgsql/include ] || [ -d /usr/include/pgsql ] || [ -d /usr/local/include/pgsql ] || [ -d /opt/pgsql/include ] || [ -f /usr/include/libpq-fe.h ] ; then echo "cdr_pgsql.so"; fi) +-CFLAGS+=$(shell if [ -d /usr/local/pgsql/include ]; then echo "-I/usr/local/pgsql/include"; fi) +-CFLAGS+=$(shell if [ -d /usr/include/pgsql ]; then echo "-I/usr/include/pgsql"; fi) +-CFLAGS+=$(shell if [ -d /usr/include/postgresql ]; then echo "-I/usr/include/postgresql"; fi) +-CFLAGS+=$(shell if [ -d /usr/local/include/pgsql ]; then echo "-I/usr/local/include/pgsql"; fi) +-CFLAGS+=$(shell if [ -d /opt/pgsql/include ]; then echo "-I/opt/pgsql/include"; fi) +-#CFLAGS+=$(shell if [ -f /usr/include/libpq-fe.h ]; then echo "-I/usr/include"; fi) ++CFLAGS+=$(shell if [ -d ${STAGING_INCDIR}/pgsql ]; then echo "-I${STAGING_INCDIR}/pgsql"; fi) ++CFLAGS+=$(shell if [ -d ${STAGING_INCDIR}/postgresql ]; then echo "-I${STAGING_INCDIR}/postgresql"; fi) + MLFLAGS= +-MLFLAGS+=$(shell if [ -d /usr/lib/pgsql ]; then echo "-L/usr/lib/pgsql"; fi) +-MLFLAGS+=$(shell if [ -d /usr/local/pgsql/lib ]; then echo "-L/usr/local/pgsql/lib"; fi) +-MLFLAGS+=$(shell if [ -d /usr/local/lib/pgsql ]; then echo "-L/usr/local/lib/pgsql"; fi) +-MLFLAGS+=$(shell if [ -d /opt/pgsql/lib ]; then echo "-L/opt/pgsql/lib"; fi) +-MLFLAGS+=$(shell if [ -f /usr/lib/libpq.so ]; then echo "-L/usr/lib"; fi) ++MLFLAGS+=$(shell if [ -d ${STAGING_LIBDIR}/pgsql ]; then echo "-L${STAGING_LIBDIR}/pgsql"; fi) + + # + # SQLIte stuff... + # +-MODS+=$(shell if [ -f "/usr/include/sqlite.h" ]; then echo "cdr_sqlite.so"; fi) ++MODS+=$(shell if [ -f "${STAGING_INCDIR}/sqlite.h" ]; then echo "cdr_sqlite.so"; fi) + + all: depend $(MODS) + +@@ -84,16 +73,16 @@ + endif + + cdr_odbc.so: cdr_odbc.o +- $(CC) $(SOLINK) -o $@ $< -lodbc $(MLFLAGS) ++ $(CC) $(SOLINK) -o $@ $< -lodbc $(LDFLAGS) $$(MLFLAGS) + + cdr_tds.so: cdr_tds.o +- $(CC) $(SOLINK) -o $@ $< -ltds $(MLFLAGS) ++ $(CC) $(SOLINK) -o $@ $< -ltds $(LDFLAGS) $$(MLFLAGS) + + cdr_pgsql.so: cdr_pgsql.o +- $(CC) $(SOLINK) -o $@ $< -lpq -lz $(MLFLAGS) ++ $(CC) $(SOLINK) -o $@ $< -lpq -lz $(LDFLAGS) $$(MLFLAGS) + + cdr_sqlite.so: cdr_sqlite.o +- $(CC) $(SOLINK) -o $@ $< -lsqlite $(MLFLAGS) ++ $(CC) $(SOLINK) -o $@ $< -lsqlite $(LDFLAGS) $(MLFLAGS) + + depend: .depend + diff --git a/packages/asterisk/asterisk_1.0.7.bb b/packages/asterisk/asterisk_1.0.7.bb deleted file mode 100644 index 1116849592..0000000000 --- a/packages/asterisk/asterisk_1.0.7.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION="The Astersisk open source software PBX" -HOMEPAGE="www.asterisk.org" -LICENSE="GPL" -SRC_URI="http://www.asterisk.org/html/downloads/asterisk-${PV}.tar.gz \ - file://makefile.patch;patch=1" - -DEPENDS="ncurses zlib openssl" - -# Doh - they use 'L'inux intead of linux -# FIXME: Do the sed here - -export OSARCH="Linux" -export PROC="${TARGET_ARCH}" - -# We will probably have to edit the CFLAG in teh Makefile - -do_compile() { - oe_runmake -} - -do_install() { - oe_runmake DESTDIR=${D} install -} diff --git a/packages/asterisk/asterisk_1.0.9.bb b/packages/asterisk/asterisk_1.0.9.bb new file mode 100644 index 0000000000..ccb6fe518f --- /dev/null +++ b/packages/asterisk/asterisk_1.0.9.bb @@ -0,0 +1,24 @@ +DESCRIPTION="The Astersisk open source software PBX" +HOMEPAGE="www.asterisk.org" +LICENSE="GPL" +SRC_URI="http://www.asterisk.org/html/downloads/asterisk-${PV}.tar.gz \ + file://gsm.patch;patch=1 \ + file://makefile.patch;patch=1" + +DEPENDS="ncurses zlib openssl" + +# Doh - they use 'L'inux intead of linux +# FIXME: Do the sed here + +export OSARCH="Linux" +export PROC="${TARGET_ARCH}" + +# We will probably have to edit the CFLAG in teh Makefile + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake DESTDIR=${D} install +} diff --git a/packages/gnome/gnome-desktop_2.10.2.bb b/packages/gnome/gnome-desktop_2.10.2.bb index d385068c59..f3eca5d574 100644 --- a/packages/gnome/gnome-desktop_2.10.2.bb +++ b/packages/gnome/gnome-desktop_2.10.2.bb @@ -2,7 +2,7 @@ LICENSE = "GPL" SECTION = "x11/gnome" PR = "r0" DESCRIPTION = "GNOME library for reading .desktop files" -inherit gnome +inherit gnome pkgconfig DEPENDS = "gnome-common libgnomeui" -- cgit v1.2.3 From f3eb2fd587d41e922fa051c983eff8c3f75814bb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 14 Aug 2005 21:28:10 +0000 Subject: linux-oz-2.6: Add wireless extentions to spitz-defconfig. Update spitzssp to fix backlight problems and remove bit banging code (yay\!). --- .../defconfig-spitz | 40 ++++++++++++++++++++-- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 10 +++--- 2 files changed, 42 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz index ce1f55b0f9..a388797b6e 100644 --- a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz +++ b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/defconfig-spitz @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.13-rc5-mm1 -# Sat Aug 13 23:17:29 2005 +# Sun Aug 14 22:04:01 2005 # CONFIG_ARM=y CONFIG_MMU=y @@ -519,12 +519,46 @@ CONFIG_NETDEVICES=y # # Wireless LAN (non-hamradio) # -# CONFIG_NET_RADIO is not set +CONFIG_NET_RADIO=y + +# +# Obsolete Wireless cards support (pre-802.11) +# +# CONFIG_STRIP is not set +# CONFIG_PCMCIA_WAVELAN is not set +# CONFIG_PCMCIA_NETWAVE is not set + +# +# Wireless 802.11 Frequency Hopping cards support +# +# CONFIG_PCMCIA_RAYCS is not set + +# +# Wireless 802.11b ISA/PCI cards support +# +# CONFIG_HERMES is not set +# CONFIG_ATMEL is not set + +# +# Wireless 802.11b Pcmcia/Cardbus cards support +# +# CONFIG_AIRO_CS is not set +# CONFIG_PCMCIA_WL3501 is not set +# CONFIG_HOSTAP is not set +CONFIG_NET_WIRELESS=y # # PCMCIA network device support # -# CONFIG_NET_PCMCIA is not set +CONFIG_NET_PCMCIA=y +# CONFIG_PCMCIA_3C589 is not set +# CONFIG_PCMCIA_3C574 is not set +# CONFIG_PCMCIA_FMVJ18X is not set +# CONFIG_PCMCIA_PCNET is not set +# CONFIG_PCMCIA_NMCLAN is not set +# CONFIG_PCMCIA_SMC91C92 is not set +# CONFIG_PCMCIA_XIRC2PS is not set +# CONFIG_PCMCIA_AXNET is not set # # Wan interfaces diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index bcc2c13c28..48728ec52b 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r4" +PR = "r5" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -81,8 +81,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/pxa27x_extraregs-r0.patch;patch=1 \ ${RPSRC}/spitzbase-r1.patch;patch=1 \ ${RPSRC}/spitzkbd-r0.patch;patch=1 \ - ${RPSRC}/spitzssp-r1.patch;patch=1 \ - ${RPSRC}/spitzbl-r0.patch;patch=1 \ + ${RPSRC}/spitzssp-r2.patch;patch=1 \ + ${RPSRC}/spitzbl-r1.patch;patch=1 \ + ${RPSRC}/spitzts-r1.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ @@ -109,8 +110,7 @@ SRC_URI_append_tosa = "${DOSRC}/nand-readid-r1.patch;patch=1 \ ${DOSRC}/wm9712-ts-r2.patch;patch=1 \ ${DOSRC}/tosa-pxaac97-r1.patch;patch=1 \ ${DOSRC}/tosa-bluetooth-r0.patch;patch=1 " -SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 \ - ${RPSRC}/spitzts-r1.patch;patch=1 " +SRC_URI_append_spitz = "${RPSRC}/spitzcf-r0.patch;patch=1 " S = "${WORKDIR}/linux-2.6.12" -- cgit v1.2.3 From a9770ead426e861ab5db9a4eb4df65296a00212a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 14 Aug 2005 21:38:54 +0000 Subject: Fix sudoers permission --- packages/sudo/sudo.inc | 4 ++++ packages/sudo/sudo_1.6.8p8.bb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/sudo/sudo.inc b/packages/sudo/sudo.inc index 279d1e61ee..7251bcdb4a 100644 --- a/packages/sudo/sudo.inc +++ b/packages/sudo/sudo.inc @@ -18,3 +18,7 @@ do_configure_prepend () { cat aclocal.m4 > acinclude.m4 fi } + +pkg_postinst() { + chmod 0440 ${sysconfdir}/sudoers +} diff --git a/packages/sudo/sudo_1.6.8p8.bb b/packages/sudo/sudo_1.6.8p8.bb index 087bcee541..cc8ae4081c 100644 --- a/packages/sudo/sudo_1.6.8p8.bb +++ b/packages/sudo/sudo_1.6.8p8.bb @@ -5,4 +5,4 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ file://noexec-link.patch;patch=1" include sudo.inc -PR = "r3" +PR = "r4" -- cgit v1.2.3 From d852dbb60699411b9970409f77cc9f6c9b6a017e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 14 Aug 2005 21:59:39 +0000 Subject: Add libgpewidget 0.103, matches cairo 0.5 API and fixes the dateselector widget --- packages/libgpewidget/libgpewidget_0.103.bb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 packages/libgpewidget/libgpewidget_0.103.bb (limited to 'packages') diff --git a/packages/libgpewidget/libgpewidget_0.103.bb b/packages/libgpewidget/libgpewidget_0.103.bb new file mode 100644 index 0000000000..0d8dcf23cf --- /dev/null +++ b/packages/libgpewidget/libgpewidget_0.103.bb @@ -0,0 +1,19 @@ +LICENSE = "LGPL" +PR = "r2" +DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." +SECTION = "gpe/libs" +PRIORITY = "optional" +MAINTAINER = "Philip Blundell " +DEPENDS = "gtk+ cairo libxrender gtk-doc intltool-native" + +SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.bz2" + +inherit pkgconfig autotools + +EXTRA_OECONF = "--enable-cairo" + +do_stage () { + oe_libinstall -C .libs -so libgpewidget ${STAGING_LIBDIR} + autotools_stage_includes +} + -- cgit v1.2.3 From 067836a2f3f4199f55727ae9ba8ff9f33e063766 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 14 Aug 2005 22:20:29 +0000 Subject: Fix hardcoded paths mess. Create localstatedir/shared/empty if not exists --- packages/vsftpd/vsftpd_2.0.3.bb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/vsftpd/vsftpd_2.0.3.bb b/packages/vsftpd/vsftpd_2.0.3.bb index 52be1d6285..ac54a96ed9 100644 --- a/packages/vsftpd/vsftpd_2.0.3.bb +++ b/packages/vsftpd/vsftpd_2.0.3.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Secure ftp daemon" SECTION = "console/network" DEPENDS = "openssl" -PR = "r2" +PR = "r3" LICENSE = "GPL" SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \ file://makefile.patch;patch=1 \ @@ -9,6 +9,13 @@ SRC_URI = "ftp://vsftpd.beasts.org/users/cevans/vsftpd-${PV}.tar.gz \ file://init \ file://vsftpd.conf" +do_configure() { + # Fix hardcoded /usr, /etc, /var mess. + cat tunables.c|sed s:\"/usr:\"${prefix}:g|sed s:\"/var:\"${localstatedir}:g \ + |sed s:\"${prefix}/share/empty:\"${localstatedir}/share/empty:g |sed s:\"/etc:\"${sysconfdir}:g > tunables.c.new + mv tunables.c.new tunables.c +} + do_compile() { oe_runmake "LIBS=-lssl -lcrypto -lcrypt -L${STAGING_LIBDIR}" } @@ -32,4 +39,5 @@ INITSCRIPT_PARAMS = "defaults" pkg_postinst() { addgroup ftp adduser --system --home /var/tmp/ftp --no-create-home --ingroup ftp --disabled-password -s /bin/false ftp -} \ No newline at end of file + mkdir -p ${localstatedir}/share/empty +} -- cgit v1.2.3 From e8b4d617bce9a8609a56be5f46cea4b96e2e4f0a Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 14 Aug 2005 22:25:39 +0000 Subject: Add vsftpd to feed --- packages/meta/openslug-packages.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 36a7836683..0a209fce0a 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -111,6 +111,7 @@ OPENSLUG_PACKAGES = "\ usbutils \ util-linux \ vlan \ + vsftpd \ wakelan \ watchdog \ wireless-tools \ -- cgit v1.2.3 From 1bf58af17a17ffeb3fa555501d625509e67290aa Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 14 Aug 2005 22:38:30 +0000 Subject: rrecommend all xine plugins in opie-mediaplayer2, remove opie-mediaplayer2-divx package --- .../opie-mediaplayer2-divx_0.1.0.bb | 23 ---------------------- packages/opie-mediaplayer2/opie-mediaplayer2.inc | 6 ++++-- .../opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb | 2 +- .../opie-mediaplayer2/opie-mediaplayer2_cvs.bb | 2 +- 4 files changed, 6 insertions(+), 27 deletions(-) delete mode 100644 packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb (limited to 'packages') diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb deleted file mode 100644 index 405d384cf8..0000000000 --- a/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "OPIE Mediaplayer DIVX pseudo package." -MAINTAINER = "Werner Schulte " -LICENSE = "GPL" -ALLOW_EMPTY = "1" -PACKAGES = "${PN}" -PACKAGE_ARCH = "all" -PR = "r1" - -DEPENDS = "opie-mediaplayer2 \ - opie-mediaplayer2-skin-default \ - libxine-fb " - -RDEPENDS = "opie-mediaplayer2 \ - opie-mediaplayer2-skin-default \ - libxine-plugin-ao-out-oss \ - libxine-plugin-decode-ff \ - libxine-plugin-decode-mad \ - libxine-plugin-dmx-audio \ - libxine-plugin-dmx-avi \ - libxine-plugin-dmx-mpeg \ - libxine-plugin-inp-file \ - libxine1" - diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2.inc b/packages/opie-mediaplayer2/opie-mediaplayer2.inc index 3372edddfd..00247fe6ad 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2.inc +++ b/packages/opie-mediaplayer2/opie-mediaplayer2.inc @@ -6,8 +6,10 @@ LICENSE = "GPL" MAINTAINER = "Team Opie " DEPENDS = "libxine-fb libqtaux2 opie-mediaplayer2-skin-default" RDEPENDS = "opie-mediaplayer2-skin" -RRECOMMENDS = "opie-mediaplayer2-skin-default libxine-plugin-ao-out-oss libxine-plugin-decode-mad \ -libxine-plugin-dmx-audio libxine-plugin-dmx-mpeg libxine-plugin-inp-file " +RRECOMMENDS = "opie-mediaplayer2-skin-default \ +libxine-plugin-ao-out-oss libxine-plugin-inp-file \ +libxine-plugin-decode-ff libxine-plugin-decode-mad \ +libxine-plugin-dmx-audio libxine-plugin-dmx-avi libxine-plugin-dmx-mpeg" APPNAME = "opieplayer2" S = "${WORKDIR}/${APPNAME}" diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb index b0fe5563e9..c94efb35ec 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb @@ -1,6 +1,6 @@ include ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb index 631f545873..cc6d9b43c1 100644 --- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb +++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb @@ -1,7 +1,7 @@ include ${PN}.inc PV = "1.2.0+cvs-${CVSDATE}" -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \ ${HANDHELDS_CVS};module=opie/pics \ -- cgit v1.2.3 From 148c1c9638f6f873e32c02277629a9dda5b90b9a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 14 Aug 2005 22:39:47 +0000 Subject: Add iptables 1.3.3 --- packages/iptables/iptables_1.3.3.bb | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 packages/iptables/iptables_1.3.3.bb (limited to 'packages') diff --git a/packages/iptables/iptables_1.3.3.bb b/packages/iptables/iptables_1.3.3.bb new file mode 100644 index 0000000000..0d6d8ccadf --- /dev/null +++ b/packages/iptables/iptables_1.3.3.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "iptables network filtering tools" +HOMEPAGE = "http://www.netfilter.org/" +SECTION = "console/utils" +LICENSE = "GPL" +PR = "r1" + +PACKAGES =+ "${PN}-utils" +FILES_${PN}-utils = "${bindir}/iptables-save ${bindir}/iptables-restore" + +SRC_URI = "http://www.netfilter.org/files/iptables-${PV}.tar.bz2" + +S = "${WORKDIR}/iptables-${PV}" + +PARALLEL_MAKE="" + +export COPT_FLAGS = "${CFLAGS}" +export KERNEL_DIR = "${STAGING_INCDIR}" + +do_compile () { + unset CFLAGS + oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1 +} + +do_install () { + oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1 +} + +FILES_${PN}-doc += "${mandir}" + -- cgit v1.2.3 From c53b1f2eb3cc1b0fc98d0d18234d580c6b051766 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 14 Aug 2005 22:41:41 +0000 Subject: Install iptables in sbindir instead of bindir --- packages/iptables/iptables_1.3.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/iptables/iptables_1.3.3.bb b/packages/iptables/iptables_1.3.3.bb index 0d6d8ccadf..a67df35806 100644 --- a/packages/iptables/iptables_1.3.3.bb +++ b/packages/iptables/iptables_1.3.3.bb @@ -18,7 +18,7 @@ export KERNEL_DIR = "${STAGING_INCDIR}" do_compile () { unset CFLAGS - oe_runmake BINDIR=${D}${bindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1 + oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1 } do_install () { -- cgit v1.2.3 From ee1f96a1105d5582d79dc1198bcb0f9ca0dcb11a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 14 Aug 2005 22:49:10 +0000 Subject: linux-oz-2.6: Merge spitz ssp driver into corgi --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index 48728ec52b..7dcd3ee7ee 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}" KV = "${@bb.data.getVar('PV',d,True)}" -PR = "r5" +PR = "r6" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -79,9 +79,9 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \ ${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \ ${RPSRC}/pxa27x_extraregs-r0.patch;patch=1 \ - ${RPSRC}/spitzbase-r1.patch;patch=1 \ + ${RPSRC}/spitzbase-r2.patch;patch=1 \ ${RPSRC}/spitzkbd-r0.patch;patch=1 \ - ${RPSRC}/spitzssp-r2.patch;patch=1 \ + ${RPSRC}/spitzssp-r4.patch;patch=1 \ ${RPSRC}/spitzbl-r1.patch;patch=1 \ ${RPSRC}/spitzts-r1.patch;patch=1 \ file://add-oz-release-string.patch;patch=1 \ -- cgit v1.2.3 From ab64846e9039ec57096945b66a66d6201f9c75bd Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 14 Aug 2005 22:52:40 +0000 Subject: ship more apps in e-image ship opieplayer2 in opie images on machines with >= 24MB flash --- packages/meta/e-image.bb | 7 ++++++- packages/meta/meta-e-x11.bb | 9 +++++---- packages/meta/opie-collections.inc | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb index f16f61c795..d58215d3a7 100644 --- a/packages/meta/e-image.bb +++ b/packages/meta/e-image.bb @@ -1,4 +1,9 @@ +DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools" +LICENSE = "MIT" +PR = "r1" + export IMAGE_BASENAME = "e-image" +export IMAGE_LINGUAS = "" DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive" @@ -6,8 +11,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/evas = "evas-x11" PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" +PREFERRED_PROVIDER_virtual/libxine = "libxine-x11" export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11 xserver-kdrive-fbdev" inherit image_ipk -LICENSE = MIT diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb index f539dac95a..b4f3558e93 100644 --- a/packages/meta/meta-e-x11.bb +++ b/packages/meta/meta-e-x11.bb @@ -12,12 +12,13 @@ ALLOW_EMPTY = 1 # X # DEPENDS += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \ - ttf-bitstream-vera bash" -RDEPENDS += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo ttf-bitstream-vera" + ttf-bitstream-vera bash" +RDEPENDS += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \ + ttf-bitstream-vera" # # E # -DEPENDS += "entrance e-wm entice" -RDEPENDS += "entrance e-wm entice" +DEPENDS += "entrance e-wm entice eclair examine " +RDEPENDS += "entrance e-wm entice eclair examine " diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc index 60cc77356a..052ddac474 100644 --- a/packages/meta/opie-collections.inc +++ b/packages/meta/opie-collections.inc @@ -77,10 +77,10 @@ OPIE_EXTRA_SETTINGS = "opie-language opie-launcher-settings opie-doctab opie-sec OPIE_DEPENDS_24 = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop \ qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix \ - opie-irc " + opie-irc opie-mediaplayer2" OPIE_RDEPENDS_24 = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop \ qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix \ - opie-irc " + opie-irc opie-mediaplayer2 libxine-plugin-decode-ff libxine-plugin-dmx-avi" # # -- cgit v1.2.3 From 2886887ee4611ab6d6bc4af836856dce541e86a0 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 15 Aug 2005 00:48:10 +0000 Subject: Update MAINTAINER and LICENCE --- packages/bwmon/bwmon_1.3.bb | 2 +- packages/icecast/icecast_2.2.0.bb | 1 + packages/sane-backends/sane-backends_1.0.15.bb | 13 +++++++------ packages/ssmtp/ssmtp_2.61.bb | 3 ++- packages/vsftpd/vsftpd_2.0.3.bb | 1 + packages/watchdog/watchdog_5.2.bb | 1 + 6 files changed, 13 insertions(+), 8 deletions(-) (limited to 'packages') diff --git a/packages/bwmon/bwmon_1.3.bb b/packages/bwmon/bwmon_1.3.bb index 26c620e013..81cc0949a9 100644 --- a/packages/bwmon/bwmon_1.3.bb +++ b/packages/bwmon/bwmon_1.3.bb @@ -1,8 +1,8 @@ DESCRIPTION = "The Linux bandwidth monitor" MAINTAINER = "Oyvind Repvik