diff options
Diffstat (limited to 'graphics/mpeg-lib/files/patch-aa')
-rw-r--r-- | graphics/mpeg-lib/files/patch-aa | 75 |
1 files changed, 38 insertions, 37 deletions
diff --git a/graphics/mpeg-lib/files/patch-aa b/graphics/mpeg-lib/files/patch-aa index 737e72f9c19..8c9208001a5 100644 --- a/graphics/mpeg-lib/files/patch-aa +++ b/graphics/mpeg-lib/files/patch-aa @@ -1,23 +1,14 @@ ---- Makefile.in.orig Tue Feb 27 04:42:54 1996 -+++ Makefile.in Sat Apr 10 21:23:36 1999 -@@ -7,7 +7,7 @@ - # Various programs and their options - - CC = @CC@ --OPT = @OPT@ -+OPT = @CFLAGS@ - DEFS = @DEFS@ - INCLUDES = -I. - CFLAGS = $(OPT) $(DEFS) $(INCLUDES) -@@ -16,6 +16,7 @@ +--- Makefile.in.orig Fri Nov 27 01:03:29 1998 ++++ Makefile.in Tue Aug 31 23:11:56 1999 +@@ -26,6 +26,7 @@ + ARFLAGS = -ru RANLIB = @RANLIB@ - SHELL = /bin/sh +.SUFFIXES: .so # Source for the library itself -- note that we define LIBSRC and # LIBOBJ this way (instead of just LIBOBJ=$(LIBSRC:.c=.o) because -@@ -27,23 +28,42 @@ +@@ -37,12 +38,17 @@ mono.c ordered.c ordered2.c mb_ordered.c LIBSRC = @libsrc@ LIBOBJ = @libobj@ @@ -27,47 +18,57 @@ # Other files of interest LIBRARY = libmpeg.a +-SHLIB = libmpeg.so +.if ${PORTOBJFORMAT} == elf -+SHLIBRARY = libmpeg.so.1 ++SHLIB = libmpeg.so.1 +.else -+SHLIBRARY = libmpeg.so.1.2 ++SHLIB = libmpeg.so.1.3 +.endif - MPEGTEST = mpegtest + HEADER = mpeg.h + EXTRAS = @extras@ + +@@ -53,7 +59,7 @@ - # Targets for all platforms + # Library/cleanup targets: --all: $(LIBRARY) @extras@ -+all: $(LIBRARY) ${SHLIBRARY} @extras@ +-all: lib $(EXTRAS) ++all: lib shlib $(EXTRAS) - $(LIBRARY): $(LIBOBJ) + lib: $(LIBRARY) + +@@ -63,14 +69,18 @@ $(AR) $(ARFLAGS) $(LIBRARY) $(LIBOBJ) $(RANLIB) $(LIBRARY) -+$(SHLIBRARY): $(SHLIBOBJ) +-$(SHLIB): $(LIBOBJ) +- $(CC) -shared -o $(SHLIB) $(LIBOBJ) +- +-install: $(LIBRARY) +- $(INSTALL) -d $(INSTALL_INCLUDE) $(INSTALL_LIBRARY) +- $(INSTALL) -m 0644 $(HEADER) $(INSTALL_INCLUDE)/$(HEADER) +- $(INSTALL) -m 0644 $(LIBRARY) $(INSTALL_LIBRARY)/$(LIBRARY) +- @if test -f $(SHLIB) ; then echo "warning: $(SHLIB) *not* installed (installing shared libraries is too system-specific)" ; fi ++$(SHLIB): $(SHLIBOBJ) +.if ${PORTOBJFORMAT} == elf -+ cc -shared -Wl,-soname,$(SHLIBRARY) -o $(SHLIBRARY) $(SHLIBOBJ) ++ $(CC) -shared -Wl,-soname,$(SHLIB) -o $(SHLIB) $(SHLIBOBJ) +.else -+ cc -shared -o $(SHLIBRARY) $(SHLIBOBJ) ++ $(CC) -shared -o $(SHLIB) $(SHLIBOBJ) +.endif -+ ln -sf $(SHLIBRARY) `echo $(SHLIBRARY) | sed 's/\.so.*$$/.so/'` ++ ln -sf $(SHLIB) `echo $(SHLIB) | sed 's/\.so.*$$/\.so/'` + - $(LIBOBJ): Makefile - +install: -+ install -c -m 444 ${LIBRARY} ${SHLIBRARY} ${PREFIX}/lib -+ (cd ${PREFIX}/lib;ln -sf $(SHLIBRARY) `echo $(SHLIBRARY) | sed 's/\.so.*$$/.so/'`) -+ install -c -m 444 mpeg.h ${PREFIX}/include -+ - @Makefile_extras@ ++ install -c -m 444 ${LIBRARY} ${SHLIB} ${PREFIX}/lib ++ (cd ${PREFIX}/lib; ln -sf $(SHLIB) `echo $(SHLIB) | sed 's/\.so.*$$/\.so/'`) ++ install -c -m 444 mpeg.h ${PREFIX}/include clean: -@@ -53,6 +73,9 @@ - distclean: clean + rm -f $(LIBRARY) $(EXTRAS) $(LIBOBJ) core +@@ -80,6 +90,8 @@ rm -f config.cache config.log config.status Makefile config.h cd extras && $(MAKE) distclean -+ + +.c.so: -+ ${CC} ${CFLAGS} -fpic -DPIC -c $< -o $@ ++ ${CC} ${CFLAGS} $(INCLUDE_DIRS) -fpic -DPIC -c $< -o $@ - # Include a system-specific Makefile fragment, if any + # Executable targets (mpegtest, easympeg [GL platforms only]) |