From bf91ea89265438b26e19062f5124ba522acd66b2 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Mon, 28 May 2012 12:17:43 +0200
Subject: [PATCH] Enable building libav without optimization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some source files do not build with -O0 due to conflicting register
allocation and inline assembler constrains. We enforce optimization (O2)
for these files.

Also, I reduced the noise from warning messages induced by lazy handling
of "assignment discards ‘const’ qualifier" and "passing argument from
incompatible pointer type" in third-party sources.
---
 libports/lib/mk/av.inc      | 11 +++++++++++
 libports/lib/mk/avcodec.inc |  2 --
 libports/lib/mk/avfilter.mk |  2 --
 libports/lib/mk/avformat.mk |  2 --
 libports/lib/mk/avutil.inc  |  2 --
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/libports/lib/mk/av.inc b/libports/lib/mk/av.inc
index f57a821be..d7c80eda0 100644
--- a/libports/lib/mk/av.inc
+++ b/libports/lib/mk/av.inc
@@ -1,6 +1,17 @@
 CC_C_OPT += -DHAVE_AV_CONFIG_H
 CC_C_OPT += -std=c99 -DPIC
 
+# The third-party sources induce a lot of "assignment discards ‘const’
+# qualifier" and "passing argument from incompatible pointer type" warnings.
+# Therefore, switch off _all_ warnings.
+CC_WARN += -w
+
+# Some source files do not build with -O0 due to conflicting register
+# allocation and inline assembler constrains. We enforce optimization for these
+# files.
+CC_OPT_h264_cabac = -O2
+CC_OPT_motion_est = -O2
+
 INC_DIR += $(REP_DIR)/src/lib/libav
 
 include $(REP_DIR)/src/lib/libav/config.mak
diff --git a/libports/lib/mk/avcodec.inc b/libports/lib/mk/avcodec.inc
index 90e82bbb9..b46880bd4 100644
--- a/libports/lib/mk/avcodec.inc
+++ b/libports/lib/mk/avcodec.inc
@@ -2,8 +2,6 @@ include $(REP_DIR)/lib/mk/av.inc
 
 include $(REP_DIR)/lib/import/import-avcodec.mk
 
-CC_WARN += -Wno-pointer-sign -Wno-uninitialized -Wno-deprecated-declarations -Wno-switch
-
 LIBAVCODEC_DIR = $(REP_DIR)/contrib/$(LIBAV)/libavcodec
 
 include $(LIBAVCODEC_DIR)/Makefile
diff --git a/libports/lib/mk/avfilter.mk b/libports/lib/mk/avfilter.mk
index b8d79b203..3e7b04f55 100644
--- a/libports/lib/mk/avfilter.mk
+++ b/libports/lib/mk/avfilter.mk
@@ -2,8 +2,6 @@ include $(REP_DIR)/lib/mk/av.inc
 
 include $(REP_DIR)/lib/import/import-avfilter.mk
 
-CC_WARN += -Wno-pointer-sign -Wno-uninitialized -Wno-switch
-
 LIBAVFILTER_DIR = $(REP_DIR)/contrib/$(LIBAV)/libavfilter
 
 include $(LIBAVFILTER_DIR)/Makefile
diff --git a/libports/lib/mk/avformat.mk b/libports/lib/mk/avformat.mk
index a9f5810cc..69cb39ad6 100644
--- a/libports/lib/mk/avformat.mk
+++ b/libports/lib/mk/avformat.mk
@@ -2,8 +2,6 @@ include $(REP_DIR)/lib/mk/av.inc
 
 include $(REP_DIR)/lib/import/import-avformat.mk
 
-CC_WARN += -Wno-pointer-sign -Wno-deprecated-declarations
-
 LIBAVFORMAT_DIR = $(REP_DIR)/contrib/$(LIBAV)/libavformat
 
 include $(LIBAVFORMAT_DIR)/Makefile
diff --git a/libports/lib/mk/avutil.inc b/libports/lib/mk/avutil.inc
index ead233593..b650023b2 100644
--- a/libports/lib/mk/avutil.inc
+++ b/libports/lib/mk/avutil.inc
@@ -2,8 +2,6 @@ include $(REP_DIR)/lib/mk/av.inc
 
 include $(REP_DIR)/lib/import/import-avutil.mk
 
-CC_WARN += -Wno-pointer-sign -Wno-switch -Wno-parentheses
-
 LIBAVUTIL_DIR = $(REP_DIR)/contrib/$(LIBAV)/libavutil
 
 include $(LIBAVUTIL_DIR)/Makefile