From c2321558c01dd5aaad60df9f9bbb4aa909073179 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 2 Apr 2011 06:15:11 +0000 Subject: [PATCH] C++ code needs to define __STDC_CONSTANT_MACROS to pull in parts of stdint.h. Necessary to be able to remove a hack in the FFmpeg port coming up. from Brad --- .../patch-plugins_video_H_263-1998_Makefile_in | 16 ++++++++++++++++ .../patch-plugins_video_H_264_Makefile_in | 16 ++++++++++++++++ .../patch-plugins_video_MPEG4-ffmpeg_Makefile_in | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 net/opal/patches/patch-plugins_video_H_263-1998_Makefile_in create mode 100644 net/opal/patches/patch-plugins_video_H_264_Makefile_in create mode 100644 net/opal/patches/patch-plugins_video_MPEG4-ffmpeg_Makefile_in diff --git a/net/opal/patches/patch-plugins_video_H_263-1998_Makefile_in b/net/opal/patches/patch-plugins_video_H_263-1998_Makefile_in new file mode 100644 index 00000000000..c67dd66b58a --- /dev/null +++ b/net/opal/patches/patch-plugins_video_H_263-1998_Makefile_in @@ -0,0 +1,16 @@ +$OpenBSD: patch-plugins_video_H_263-1998_Makefile_in,v 1.1 2011/04/02 06:15:11 ajacoutot Exp $ + +C++ code needs to define __STDC_CONSTANT_MACROS to pull in parts of +stdint.h (needed by graphics/ffmpeg). + +--- plugins/video/H.263-1998/Makefile.in.orig Thu Mar 31 23:45:08 2011 ++++ plugins/video/H.263-1998/Makefile.in Thu Mar 31 23:45:30 2011 +@@ -56,7 +56,7 @@ ifdef TRACE_FILE + CFLAGS += -DTRACE_FILE=1 + endif + +-EXTRACCFLAGS += $(LIBAVCODEC_CFLAGS) -I$(COMMONDIR) -I$(PLUGINDIR) ++EXTRACCFLAGS += $(LIBAVCODEC_CFLAGS) -I$(COMMONDIR) -I$(PLUGINDIR) -D__STDC_CONSTANT_MACROS + + vpath %.cxx $(COMMONDIR) + vpath %.o $(OBJDIR) diff --git a/net/opal/patches/patch-plugins_video_H_264_Makefile_in b/net/opal/patches/patch-plugins_video_H_264_Makefile_in new file mode 100644 index 00000000000..2a48d015f72 --- /dev/null +++ b/net/opal/patches/patch-plugins_video_H_264_Makefile_in @@ -0,0 +1,16 @@ +$OpenBSD: patch-plugins_video_H_264_Makefile_in,v 1.1 2011/04/02 06:15:11 ajacoutot Exp $ + +C++ code needs to define __STDC_CONSTANT_MACROS to pull in parts of +stdint.h (needed by graphics/ffmpeg). + +--- plugins/video/H.264/Makefile.in.orig Thu Mar 31 23:43:27 2011 ++++ plugins/video/H.264/Makefile.in Thu Mar 31 23:43:56 2011 +@@ -94,7 +94,7 @@ STDCCFLAGS =@STDCCFLAGS@ + LDFLAGS =@LDFLAGS@ + LIBAVCODEC_CFLAGS=@LIBAVCODEC_CFLAGS@ + +-EXTRACCFLAGS += $(LIBAVCODEC_CFLAGS) -I$(COMMONDIR) -I$(PLUGINDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"$(VC_PLUGIN_DIR)"' -DLICENCE_MPL ++EXTRACCFLAGS += $(LIBAVCODEC_CFLAGS) -I$(COMMONDIR) -I$(PLUGINDIR) -DLIB_DIR='"$(libdir)"' -DVC_PLUGIN_DIR='"$(VC_PLUGIN_DIR)"' -DLICENCE_MPL -D__STDC_CONSTANT_MACROS + + vpath %.cxx $(SHAREDDIR) + vpath %.cxx $(COMMONDIR) diff --git a/net/opal/patches/patch-plugins_video_MPEG4-ffmpeg_Makefile_in b/net/opal/patches/patch-plugins_video_MPEG4-ffmpeg_Makefile_in new file mode 100644 index 00000000000..6a7c1fc5eb3 --- /dev/null +++ b/net/opal/patches/patch-plugins_video_MPEG4-ffmpeg_Makefile_in @@ -0,0 +1,16 @@ +$OpenBSD: patch-plugins_video_MPEG4-ffmpeg_Makefile_in,v 1.1 2011/04/02 06:15:11 ajacoutot Exp $ + +C++ code needs to define __STDC_CONSTANT_MACROS to pull in parts of +stdint.h (needed by graphics/ffmpeg). + +--- plugins/video/MPEG4-ffmpeg/Makefile.in.orig Thu Mar 31 23:49:44 2011 ++++ plugins/video/MPEG4-ffmpeg/Makefile.in Thu Mar 31 23:50:23 2011 +@@ -76,7 +76,7 @@ LIBAVCODEC_SOURCE_DIR = @LIBAVCODEC_SOURCE_DIR@ + + # Add LIBAVCODEC_SOURCE_DIR to the include path so we can #include + # Also add libavutil, so ffmpeg headers can #include "log.h". +-EXTRACCFLAGS += $(LIBAVCODEC_CFLAGS) -I$(COMMONDIR) -I$(PLUGINDIR) ++EXTRACCFLAGS += $(LIBAVCODEC_CFLAGS) -I$(COMMONDIR) -I$(PLUGINDIR) -D__STDC_CONSTANT_MACROS + + ifneq (,$(LIBAVCODEC_SOURCE_DIR)) + EXTRACCFLAGS += -I$(LIBAVCODEC_SOURCE_DIR) -I$(LIBAVCODEC_SOURCE_DIR)/libavutil