diff options
Diffstat (limited to 'audio/daapd/patches')
| -rw-r--r-- | audio/daapd/patches/patch-aa | 35 | ||||
| -rw-r--r-- | audio/daapd/patches/patch-ab | 15 |
2 files changed, 18 insertions, 32 deletions
diff --git a/audio/daapd/patches/patch-aa b/audio/daapd/patches/patch-aa index 02dcf6d15d9..9769d67ff01 100644 --- a/audio/daapd/patches/patch-aa +++ b/audio/daapd/patches/patch-aa @@ -1,22 +1,22 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/06/05 19:07:51 nathanw Exp $ +$NetBSD: patch-aa,v 1.2 2004/11/20 15:08:23 mjl Exp $ ---- makefile.orig 2004-04-17 07:14:45.000000000 -0400 -+++ makefile 2004-06-04 15:34:59.000000000 -0400 -@@ -1,7 +1,7 @@ - # configure daapd here +--- makefile.orig 2004-09-08 03:17:58.000000000 +0200 ++++ makefile 2004-11-20 15:13:35.000000000 +0100 +@@ -2,7 +2,7 @@ HOWL_ENABLE = 1 + ZLIB_ENABLE = 1 -MPEG4_ENABLE = 1 +MPEG4_ENABLE = 0 # no need to touch anything below this line -@@ -13,16 +13,14 @@ +@@ -14,16 +14,16 @@ DEPS = daaplib_ libhttpd_ OBJS = daapd.o db.o dboutput.o songcache.o parsemp3.o - LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz --LIBPATH = -L. -L/usr/local/lib -L./daaplib/src -L./libhttpd/src --INCPATH = -I. -I/usr/local/include -I./daaplib/include -I./libhttpd/src + LIBS = -ldaaplib -lhttpd-persistent -lid3tag -lz -lpthread +-LIBPATH = -L. -L./daaplib/src -L./libhttpd/src -L/usr/local/lib +-INCPATH = -I. -I./daaplib/include -I./libhttpd/src -I/usr/local/include -DEPLOY = /usr/local -CFLAGS = -Wall -Wno-multichar +LIBPATH = -L. ${LDFLAGS} -L./daaplib/src -L./libhttpd/src @@ -26,14 +26,15 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/06/05 19:07:51 nathanw Exp $ # HOWL ifeq ($(HOWL_ENABLE),1) -- HOWLDIRS := $(sort $(wildcard /usr/local/include/howl-*) ) -- HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) ) -- INCPATH := $(INCPATH) -I$(HOWLRECENT) -+ INCPATH := $(INCPATH) -I${PREFIX}/include/howl - LIBS := $(LIBS) -lpthread -lhowl - CFLAGS := $(CFLAGS) -DHOWL_ENABLE - ifneq ($(shell $(CC) -E -dM - < /dev/null | grep __APPLE__),) -@@ -70,8 +68,6 @@ +- HOWLDIRS := $(sort $(wildcard /usr/local/include/howl*) ) ++ HOWLDIRS := $(sort $(wildcard ${PREFIX}/include/howl*) ) + ifeq ($(words $(HOWLDIRS) ), 0) +-$(error howl not found in /usr/local/include. Install howl or disable it in the makefile) ++$(error howl not found in ${PREFIX}/include. Install howl or disable it in the makefile) + endif + HOWLRECENT := $(word $(words $(HOWLDIRS)),$(HOWLDIRS) ) + INCPATH := $(INCPATH) -I$(HOWLRECENT) +@@ -74,8 +74,6 @@ rm $(OBJS) $(TARGET) install: $(DEPS) $(TARGET) diff --git a/audio/daapd/patches/patch-ab b/audio/daapd/patches/patch-ab deleted file mode 100644 index a1cf245bea9..00000000000 --- a/audio/daapd/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/06/05 19:07:51 nathanw Exp $ - ---- daaplib/src/makefile.orig 2004-04-13 19:35:14.000000000 -0400 -+++ daaplib/src/makefile 2004-06-04 13:58:11.000000000 -0400 -@@ -8,8 +8,8 @@ -
- LIBS =
- LIBPATH =
--LIBDEPLOY = /usr/local/lib
--INCDEPLOY = /usr/local/include
-+LIBDEPLOY = ${PREFIX}/lib
-+INCDEPLOY = ${PREFIX}/include
- INCPATH = ../include
- CFLAGS = -Wall -Wno-multichar
-
|