more 2.6.39 fixes

4 files changed, 0 insertions, 127 deletions

diff --git a/package/palantir/Makefile b/package/palantir/Makefile
deleted file mode 100644
index 5deb3c83f..000000000
--- a/package/palantir/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		palantir
-PKG_VERSION:=		2.7
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		3a5b1fb340857f6d8e357bf39b77583e
-PKG_DESCR:=		A multichannel interactive streaming solution
-PKG_SECTION:=		multimedia
-PKG_DEPENDS:=		libjpeg libpthread
-PKG_BUILDDEP:=		jpeg
-PKG_URL:=		http://www.fastpath.it/products/palantir/
-PKG_SITES:=		http://www.fastpath.it/products/palantir/pub/
-
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,PALANTIR,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=          manual
-BUILD_STYLE:=           manual
-INSTALL_STYLE:=         manual
-
-TARGET_CFLAGS+=		-Wall
-TARGET_CPPFLAGS+=	-D_REENTRANT
-
-do-build:
-	mkdir -p ${WRKINST}/usr
-	${MAKE} -C ${WRKBUILD}/server/libgsm \
-		${TARGET_CONFIGURE_OPTS} \
-		CCINC="${TARGET_CPPFLAGS}" \
-		lib/libgsm.a
-	${MAKE} -C ${WRKBUILD}/server \
-		${TARGET_CONFIGURE_OPTS} \
-		palantir
-
-do-install:
-	${INSTALL_DIR} ${IDIR_PALANTIR}/etc
-	${INSTALL_DIR} ${IDIR_PALANTIR}/usr/sbin
-	${INSTALL_DATA} ${WRKBUILD}/server/palantir-mips.conf.sample \
-	                ${IDIR_PALANTIR}/etc/palantir.conf
-	${INSTALL_BIN} ${WRKBUILD}/server/palantir ${IDIR_PALANTIR}/usr/sbin/
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/palantir/files/palantir.conffiles b/package/palantir/files/palantir.conffiles
deleted file mode 100644
index a57f0c6fd..000000000
--- a/package/palantir/files/palantir.conffiles
+++ /dev/null
@@ -1 +0,0 @@
-/etc/palantir.conf
diff --git a/package/palantir/patches/patch-server_Makefile b/package/palantir/patches/patch-server_Makefile
deleted file mode 100644
index a9bc81951..000000000
--- a/package/palantir/patches/patch-server_Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- palantir-2.7.orig/server/Makefile	2007-05-19 01:31:36.000000000 +0200
-+++ palantir-2.7/server/Makefile	2011-01-20 15:24:19.478658283 +0100
-@@ -47,10 +47,11 @@ ENABLE_X11MON=	0
- .PHONY : tools man
- 
- 
--CFLAGS= -Wall -D_REENTRANT -O2 -g
-+CFLAGS?= -Wall -D_REENTRANT -O2 -g
- # -O3
--CC= gcc
--libjpeg= -ljpeg
-+CC?= gcc
-+LIBS?=
-+LIBS+= -ljpeg -lpthread
- 
- ifeq ($(TARGET),mips)
- 	BROADCOM_SRC= /usr/local/broadcom/src
-@@ -86,7 +87,7 @@ SRCS= *.c
- libgsm= libgsm/lib/libgsm.a
- 
- palantir: $(libgsm) $(OBJ) tools man
--	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(libgsm) $(libjpeg) -lpthread -o palantir
-+	$(CC) $(LDFLAGS) $(OBJ) $(libgsm) $(LIBS) -o palantir
- 
- mips:
- 	make TARGET=mips palantir
diff --git a/package/palantir/patches/patch-server_libgsm_Makefile b/package/palantir/patches/patch-server_libgsm_Makefile
deleted file mode 100644
index 079e9a825..000000000
--- a/package/palantir/patches/patch-server_libgsm_Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
---- palantir-2.7.orig/server/libgsm/Makefile	2007-03-31 11:50:49.000000000 +0200
-+++ palantir-2.7/server/libgsm/Makefile	2011-01-20 15:22:46.318658281 +0100
-@@ -49,11 +49,11 @@ WAV49	= -DWAV49
- # CCFLAGS 	= -c -O
- 
- ifndef CC
--CC		= gcc
-+CC		?= gcc
- endif
- 
--CC		+= -ansi -pedantic
--CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1
-+CFLAGS		+= -ansi -pedantic
-+CPPFLAGS 	?= -DNeedFunctionPrototypes=1
- 
- LD 		= $(CC)
- 
-@@ -80,7 +80,7 @@ SHELL		= /bin/sh
- LN		= ln
- BASENAME 	= basename
- ifndef AR
--AR		= ar
-+AR		?= ar
- endif
- ARFLAGS		= cr
- RMFLAGS		=
-@@ -89,7 +89,7 @@ COMPRESS 	= compress
- COMPRESSFLAGS 	= 
- # RANLIB 	= true
- ifndef RANLIB
--RANLIB	 	= ranlib
-+RANLIB	 	?= ranlib
- endif
- 
- #
-@@ -109,7 +109,7 @@ INC	= $(ROOT)/inc
- # DEBUG	= -DNDEBUG
- ######### Remove -DNDEBUG to enable assertions.
- 
--CFLAGS	= $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
-+CFLAGS	+= $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
- 	$(WAV49) $(CCINC) -I$(INC)
- ######### It's $(CC) $(CFLAGS)
- 
-@@ -177,7 +177,7 @@ GSM_OBJECTS =	$(SRC)/add.o		\
- # Default rules
- 
- .c.o:
--		$(CC) $(CFLAGS) $?
-+		$(CC) $(CPPFLAGS) $(CFLAGS) -c $?
- 		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
- 
- # Target rules