Created
April 5, 2010 15:02
-
-
Save edwardgeorge/356431 to your computer and use it in GitHub Desktop.
mac homebrew patches
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -r d0965fd3703b configure | |
--- a/configure Mon Apr 05 15:52:33 2010 +0100 | |
+++ b/configure Mon Apr 05 16:14:48 2010 +0100 | |
@@ -610,9 +610,9 @@ | |
fi | |
echolog "Checking for libavformat ..." | |
-check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !" | |
+check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !" | |
echolog "Checking for libavcodec ..." | |
-check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !" | |
+check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !" | |
################################################# | |
# version | |
@@ -688,7 +688,7 @@ | |
fi | |
append_config "EXTRALIBS=$extralibs" | |
-append_config "OPTFLAGS=$CFLAGS" | |
+append_config "CFLAGS=$CFLAGS" | |
append_config "LDFLAGS=$LDFLAGS" | |
append_config "INSTALL=$INSTALL" | |
diff -r d0965fd3703b gmon.out | |
Binary file gmon.out has changed | |
diff -r d0965fd3703b src/Makefile | |
--- a/src/Makefile Mon Apr 05 15:52:33 2010 +0100 | |
+++ b/src/Makefile Mon Apr 05 16:14:48 2010 +0100 | |
@@ -13,7 +13,7 @@ | |
endif | |
LIBNAME = libdlna | |
-LIBNAME_SHARED = ${LIBNAME}.so | |
+LIBNAME_SHARED = ${LIBNAME}.dylib | |
LIBNAME_STATIC = ${LIBNAME}.a | |
LIBNAME_VERSION = $(LIBNAME_SHARED).$(VERSION) | |
LIBNAME_MAJOR = $(LIBNAME_SHARED).$(shell echo $(VERSION) | cut -f1 -d.) | |
@@ -89,13 +89,12 @@ | |
@echo "#############################################" | |
lib_shared: lib_shared_info_pre $(LOBJS) lib_shared_info_post | |
- $(CC) -shared -Wl,-soname,$(LIBNAME_MAJOR) $(LOBJS) \ | |
- $(LDFLAGS) $(EXTRALIBS) -o $(LIBNAME_VERSION) | |
+ $(CC) -dynamiclib -install_name $(PREFIX)/lib/$(LIBNAME_SHARED) $(LOBJS) $(LDFLAGS) $(EXTRALIBS) -o $(LIBNAME_VERSION) -compatibility_version $(VERSION) -current_version $(VERSION) | |
$(LN) -sf $(LIBNAME_VERSION) $(LIBNAME_MAJOR) | |
$(LN) -sf $(LIBNAME_MAJOR) $(LIBNAME_SHARED) | |
clean: | |
- -$(RM) -f *.o *.lo *.a *.so* | |
+ -$(RM) -f *.o *.lo *.a *.dylib* | |
-$(RM) -f .depend | |
install_static: lib_static | |
diff -r d0965fd3703b src/av_mpeg4_part10.c | |
--- a/src/av_mpeg4_part10.c Mon Apr 05 15:52:33 2010 +0100 | |
+++ b/src/av_mpeg4_part10.c Mon Apr 05 16:14:48 2010 +0100 | |
@@ -26,7 +26,7 @@ | |
#include <sys/stat.h> | |
#include <fcntl.h> | |
-#include <ffmpeg/avcodec.h> | |
+#include <libavcodec/avcodec.h> | |
#include "dlna_internals.h" | |
#include "profiles.h" | |
diff -r d0965fd3703b src/av_mpeg4_part2.c | |
--- a/src/av_mpeg4_part2.c Mon Apr 05 15:52:33 2010 +0100 | |
+++ b/src/av_mpeg4_part2.c Mon Apr 05 16:14:48 2010 +0100 | |
@@ -26,7 +26,7 @@ | |
#include <sys/stat.h> | |
#include <fcntl.h> | |
-#include <ffmpeg/avcodec.h> | |
+#include <libavcodec/avcodec.h> | |
#include "dlna_internals.h" | |
#include "profiles.h" | |
diff -r d0965fd3703b src/containers.c | |
--- a/src/containers.c Mon Apr 05 15:52:33 2010 +0100 | |
+++ b/src/containers.c Mon Apr 05 16:14:48 2010 +0100 | |
@@ -4,7 +4,7 @@ | |
#include <sys/stat.h> | |
#include <fcntl.h> | |
-#include <ffmpeg/avformat.h> | |
+#include <libavformat/avformat.h> | |
#include "containers.h" | |
#include "profiles.h" | |
diff -r d0965fd3703b src/profiles.h | |
--- a/src/profiles.h Mon Apr 05 15:52:33 2010 +0100 | |
+++ b/src/profiles.h Mon Apr 05 16:14:48 2010 +0100 | |
@@ -22,8 +22,8 @@ | |
#ifndef _PROFILES_H_ | |
#define _PROFILES_H_ | |
-#include <ffmpeg/avcodec.h> | |
-#include <ffmpeg/avformat.h> | |
+#include <libavcodec/avcodec.h> | |
+#include <libavformat/avformat.h> | |
#include "dlna_internals.h" | |
#include "containers.h" | |
diff -r d0965fd3703b src/upnp_dms.c | |
--- a/src/upnp_dms.c Mon Apr 05 15:52:33 2010 +0100 | |
+++ b/src/upnp_dms.c Mon Apr 05 16:14:48 2010 +0100 | |
@@ -20,6 +20,7 @@ | |
*/ | |
#include <stdio.h> | |
+#include <stdlib.h> | |
#include <string.h> | |
#include "dlna_internals.h" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment