summaryrefslogtreecommitdiff
path: root/multimedia/libmpeg3/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/libmpeg3/patches/patch-aa')
-rw-r--r--multimedia/libmpeg3/patches/patch-aa37
1 files changed, 31 insertions, 6 deletions
diff --git a/multimedia/libmpeg3/patches/patch-aa b/multimedia/libmpeg3/patches/patch-aa
index e4fd99e750a..71d50384cec 100644
--- a/multimedia/libmpeg3/patches/patch-aa
+++ b/multimedia/libmpeg3/patches/patch-aa
@@ -1,22 +1,47 @@
-$NetBSD: patch-aa,v 1.2 2005/07/13 13:16:36 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2006/04/19 17:03:26 wiz Exp $
--- Makefile.orig 2001-05-20 05:05:26.000000000 +0200
+++ Makefile
-@@ -2,7 +2,7 @@ include global_config
+@@ -2,12 +2,7 @@ include global_config
CFLAGS +=
-OBJDIR = $(shell uname --machine)
+-
+-$(shell sh -c 'if ! test -d $(OBJDIR)\; then \
+- mkdir $(OBJDIR)\; \
+- mkdir $(OBJDIR)/audio\; \
+- mkdir $(OBJDIR)/video\; fi' )
+OBJDIR = work
- $(shell sh -c 'if ! test -d $(OBJDIR)\; then \
- mkdir $(OBJDIR)\; \
-@@ -69,7 +69,7 @@ OBJS = \
+ ifeq ($(OBJDIR), alpha)
+ USE_MMX = 0
+@@ -69,11 +64,16 @@ OBJS = \
OUTPUT = $(OBJDIR)/libmpeg3.a
UTILS = $(OBJDIR)/dump $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3split
-LIBS = -lm -lpthread
+LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
++
++all: prepare $(OUTPUT) util
- all: $(OUTPUT) util
+-all: $(OUTPUT) util
++prepare:
++ mkdir -p $(OBJDIR)
++ mkdir -p $(OBJDIR)/audio
++ mkdir -p $(OBJDIR)/video
+-$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS)
++$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) prepare
+ ar rcs $(OUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS)
+
+ $(OBJDIR)/dump: $(OBJDIR)/dump.o $(OUTPUT)
+@@ -88,7 +88,7 @@ $(OBJDIR)/mpeg3toc: $(OBJDIR)/mpeg3toc.o
+ $(OBJDIR)/mpeg3split: $(OBJDIR)/mpeg3split.o $(OUTPUT)
+ $(CC) -o $(OBJDIR)/mpeg3split $(OBJDIR)/mpeg3split.o $(OUTPUT) $(LIBS)
+
+-util: $(UTILS)
++util: $(UTILS) prepare
+
+ clean:
+ find \( -name core \