Attachment 35058 Details for Bug 56721 – file.diff

[patch] file.diff

file.diff (text/plain), 2.77 KB, created by Simon Barner on 2003-09-11 23:00:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Barner

Created: 2003-09-11 23:00:35 UTC

Size: 2.77 KB

patch

obsolete

>--- Makefile.orig	Thu Sep 11 23:30:31 2003
>+++ Makefile	Thu Sep 11 23:38:50 2003
>@@ -35,6 +35,7 @@
> HEADER_FILES=	libavcodec/avcodec.h libavcodec/common.h \
> 		libavcodec/dsputil.h
> LIB_FILES=	libavcodec/libavcodec.a libavformat/libavformat.a
>+MAN1=		ffmpeg.1 ffplay.1 ffserver.1
> 
> .include <bsd.port.pre.mk>
> 
>@@ -238,8 +239,5 @@
> .for file in ${LIB_FILES}
> 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/lib/${file:T}
> .endfor
>-# add shared lib link
>-	@${LN} -sf libavcodec.so \
>-		${PREFIX}/lib/libavcodec.so.${SHLIB_VERSION}
> 
> .include <bsd.port.post.mk>
>--- pkg-plist.orig	Thu Sep 11 22:58:29 2003
>+++ pkg-plist	Thu Sep 11 23:25:09 2003
>@@ -14,6 +14,8 @@
> lib/libavcodec.so
> lib/libavcodec.so.%%SHLIB_VERSION%%
> lib/libavformat.a
>+lib/libavformat.so
>+lib/libavformat.so.%%SHLIB_VERSION%%
> %%VHOOK%%lib/vhook/drawtext.so
> %%VHOOK%%lib/vhook/fish.so
> %%VHOOK%%%%IMLIB2%%lib/vhook/imlib2.so
>--- /dev/null	Thu Sep 11 23:42:19 2003
>+++ files/patch-libavformat::Makefile	Thu Sep 11 23:17:13 2003
>@@ -0,0 +1,13 @@
>+--- libavformat/Makefile.orig	Thu Sep 11 22:55:10 2003
>++++ libavformat/Makefile	Thu Sep 11 23:12:50 2003
>+@@ -88,8 +88,8 @@
>+ install: all
>+ ifeq ($(BUILD_SHARED),yes)
>+ 	install -d $(prefix)/lib
>+-	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat-$(VERSION).so
>+-	ln -sf libavformat-$(VERSION).so $(prefix)/lib/libavformat.so
>++	install -s -m 755 $(SLIB) $(prefix)/lib/libavformat.so.0
>++	ln -sf libavformat.so.0 $(prefix)/lib/libavformat.so
>+ 	ldconfig || true
>+ 	mkdir -p $(prefix)/include/ffmpeg
>+ 	install -m 644 $(VPATH)/avformat.h $(prefix)/include/ffmpeg/avformat.h
>--- files/patch-libavcodec::Makefile.orig	Thu Sep 11 23:47:40 2003
>+++ files/patch-libavcodec::Makefile	Thu Sep 11 23:15:28 2003
>@@ -1,5 +1,5 @@
>---- libavcodec/Makefile.orig	Sun Oct  6 12:26:38 2002
>-+++ libavcodec/Makefile	Wed Oct  9 14:24:34 2002
>+--- libavcodec/Makefile.orig	Thu Sep 11 22:55:09 2003
>++++ libavcodec/Makefile	Thu Sep 11 23:14:59 2003
> @@ -7,8 +7,7 @@
>  VPATH=$(SRC_PATH)/libavcodec
>  
>@@ -9,14 +9,15 @@
> +CFLAGS= $(OPTFLAGS) -Wall -DHAVE_AV_CONFIG_H -I.. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
>  
>  OBJS= common.o utils.o mem.o allcodecs.o \
>-       mpegvideo.o h263.o jrevdct.o jfdctfst.o jfdctint.o\
>-@@ -167,8 +166,7 @@
>+       mpegvideo.o jrevdct.o jfdctfst.o jfdctint.o\
>+@@ -233,8 +232,8 @@
>  install: all
>  ifeq ($(BUILD_SHARED),yes)
>  	install -d $(prefix)/lib
> -	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec-$(VERSION).so
> -	ln -sf libavcodec-$(VERSION).so $(prefix)/lib/libavcodec.so
>-+	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec.so
>++	install -s -m 755 $(SLIB) $(prefix)/lib/libavcodec.so.0
>++	ln -sf $(prefix)/libavcodec.so.0 $(prefix)/lib/libavcodec.so
>  	ldconfig || true
>  	mkdir -p $(prefix)/include/ffmpeg
>  	install -m 644 $(VPATH)/avcodec.h $(prefix)/include/ffmpeg/avcodec.h

Actions: View | Diff

Attachments on bug 56721: 35058