[SCM] gpac/master: Don't fail build intentionally on unknown systems

rbalint at users.alioth.debian.org rbalint at users.alioth.debian.org
Sat Jun 27 21:52:33 UTC 2015


The following commit has been merged in the master branch:
commit 98370c47578a43f0c4c714fa4f4957b9917868f6
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Fri Jun 26 20:10:29 2015 -0700

    Don't fail build intentionally on unknown systems

diff --git a/debian/patches/dont-err-build-on-uknown-system.patch b/debian/patches/dont-err-build-on-uknown-system.patch
new file mode 100644
index 0000000..2d57c36
--- /dev/null
+++ b/debian/patches/dont-err-build-on-uknown-system.patch
@@ -0,0 +1,18 @@
+Description: Don't fail build intentionally on unknown systems
+Author: Balint Reczey <balint at balintreczey.hu>
+
+diff --git a/include/gpac/configuration.h b/include/gpac/configuration.h
+index 2c58fc3..70dcafc 100644
+--- a/include/gpac/configuration.h
++++ b/include/gpac/configuration.h
+@@ -147,8 +147,8 @@
+ #define GPAC_HAS_JPEG
+ #define GPAC_HAS_PNG
+ 
+-#else
+-#error "Unknown target platform used with static configuration file"
++//#else
++//#error "Unknown target platform used with static configuration file"
+ #endif
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 49b48c8..8c38836 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ mp4box-manpage-fix.patch
 gcc-optflags.patch
 libav10.patch
 export_gf_isom_set_pixel_aspect_ratio.patch
+dont-err-build-on-uknown-system.patch

-- 
gpac packaging



More information about the pkg-multimedia-commits mailing list