From ee6393f3eabb033d168da7fcbae710a3b24f2d5d Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Mon, 13 Jul 2015 10:52:47 +0200 Subject: [PATCH 1/5] Check "make dist" in Travis. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3ad33dd4a..e346bcfe5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,7 @@ before_script: script: - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then ./scripts/check_licenses.sh; fi" - make + - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then make dist && mkdir dist-test && cd dist-test && tar xzf ../libde265-*.tar.gz && cd libde265-* && ./configure && make; fi" - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then LD_LIBRARY_PATH=./libde265/.libs/ valgrind --tool=memcheck --quiet --error-exitcode=1 ./dec265/.libs/dec265 -q -c -f 100 ./libde265-data/IDR-only/paris-352x288-intra.bin; fi" - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then LD_LIBRARY_PATH=./libde265/.libs/ valgrind --tool=memcheck --quiet --error-exitcode=1 ./dec265/.libs/dec265 -t 4 -q -c -f 100 ./libde265-data/IDR-only/paris-352x288-intra.bin; fi" - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then LD_LIBRARY_PATH=./libde265/.libs/ valgrind --tool=memcheck --quiet --error-exitcode=1 ./dec265/.libs/dec265 -q -c -f 100 ./libde265-data/RandomAccess/paris-ra-wpp.bin; fi" From 9b5f5b23aba00e31f484321a5a7296f7eddf18a2 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Mon, 13 Jul 2015 10:53:01 +0200 Subject: [PATCH 2/5] Include "contextmodel.h" in dist tarball. --- libde265/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libde265/Makefile.am b/libde265/Makefile.am index 29ee58399..fa120b39b 100644 --- a/libde265/Makefile.am +++ b/libde265/Makefile.am @@ -75,7 +75,7 @@ libde265_la_SOURCES = \ image-io.h image-io.cc \ alloc_pool.h alloc_pool.cc \ en265.h en265.cc \ - contextmodel.cc + contextmodel.cc contextmodel.h SUBDIRS = encoder libde265_la_LIBADD += encoder/libde265_encoder.la From b75c302c9665d369211d4c4ee5cf15d8b707472e Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Mon, 13 Jul 2015 11:10:14 +0200 Subject: [PATCH 3/5] Format/sort list of files. --- libde265/Makefile.am | 80 ++++++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 33 deletions(-) diff --git a/libde265/Makefile.am b/libde265/Makefile.am index fa120b39b..007c7ca31 100644 --- a/libde265/Makefile.am +++ b/libde265/Makefile.am @@ -22,60 +22,74 @@ libde265_la_LDFLAGS = -version-info $(LIBDE265_CURRENT):$(LIBDE265_REVISION):$(L libde265_la_LIBADD = -lstdc++ libde265_la_SOURCES = \ + acceleration.h \ + alloc_pool.h \ + alloc_pool.cc \ bitstream.cc \ + bitstream.h \ cabac.cc \ + cabac.h \ + configparam.cc \ + configparam.h \ + contextmodel.cc \ + contextmodel.h \ de265.cc \ deblock.cc \ + deblock.h \ decctx.cc \ - nal-parser.cc \ - nal-parser.h \ + decctx.h \ + en265.h \ + en265.cc \ + fallback.cc \ + fallback.h \ + fallback-dct.h \ + fallback-dct.cc \ + fallback-motion.cc \ + fallback-motion.h \ dpb.cc \ dpb.h \ image.cc \ - intrapred.cc \ - md5.cc \ - nal.cc \ - pps.cc \ - transform.cc \ - refpic.cc \ - sao.cc \ - scan.cc \ - sei.cc \ - slice.cc \ - sps.cc \ - util.cc \ - vps.cc \ - bitstream.h \ - cabac.h \ - deblock.h \ - decctx.h \ image.h \ + image-io.h \ + image-io.cc \ + intrapred.cc \ intrapred.h \ + md5.cc \ md5.h \ + motion.cc \ + motion.h \ + nal.cc \ nal.h \ + nal-parser.cc \ + nal-parser.h \ + pps.cc \ pps.h \ - transform.h \ + quality.cc \ + quality.h \ + refpic.cc \ refpic.h \ + sao.cc \ sao.h \ + scan.cc \ scan.h \ + sei.cc \ sei.h \ + slice.cc \ slice.h \ + sps.cc \ sps.h \ + threads.cc \ + threads.h \ + transform.cc \ + transform.h \ + util.cc \ util.h \ + visualize.cc \ + visualize.h \ + vps.cc \ vps.h \ - vui.h vui.cc \ - motion.cc motion.h \ - threads.cc threads.h \ - visualize.cc visualize.h \ - acceleration.h \ - fallback.cc fallback.h fallback-motion.cc fallback-motion.h \ - fallback-dct.h fallback-dct.cc \ - quality.cc quality.h \ - configparam.cc configparam.h \ - image-io.h image-io.cc \ - alloc_pool.h alloc_pool.cc \ - en265.h en265.cc \ - contextmodel.cc contextmodel.h + vui.cc \ + vui.h SUBDIRS = encoder libde265_la_LIBADD += encoder/libde265_encoder.la From 898851d9bfcc57dbe0005e8c4321b82774fdb309 Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Mon, 13 Jul 2015 11:32:37 +0200 Subject: [PATCH 4/5] Also check cmake with distribution tarball. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e346bcfe5..99dd89452 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,6 +54,7 @@ script: - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then ./scripts/check_licenses.sh; fi" - make - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then make dist && mkdir dist-test && cd dist-test && tar xzf ../libde265-*.tar.gz && cd libde265-* && ./configure && make; fi" + - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then make dist && mkdir dist-cmake-test && cd dist-cmake-test && tar xzf ../libde265-*.tar.gz && cd libde265-* && cmake . && make; fi" - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then LD_LIBRARY_PATH=./libde265/.libs/ valgrind --tool=memcheck --quiet --error-exitcode=1 ./dec265/.libs/dec265 -q -c -f 100 ./libde265-data/IDR-only/paris-352x288-intra.bin; fi" - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then LD_LIBRARY_PATH=./libde265/.libs/ valgrind --tool=memcheck --quiet --error-exitcode=1 ./dec265/.libs/dec265 -t 4 -q -c -f 100 ./libde265-data/IDR-only/paris-352x288-intra.bin; fi" - sh -c "if [ -z "$HOST" ] && [ -z "$DECODESTREAMS" ]; then LD_LIBRARY_PATH=./libde265/.libs/ valgrind --tool=memcheck --quiet --error-exitcode=1 ./dec265/.libs/dec265 -q -c -f 100 ./libde265-data/RandomAccess/paris-ra-wpp.bin; fi" From 0172511d9c7f94648dabd2d698e8428705cbca8d Mon Sep 17 00:00:00 2001 From: Joachim Bauch Date: Tue, 14 Jul 2015 11:49:47 +0200 Subject: [PATCH 5/5] Enable C++11 when compiling with clang. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00c5a0fdd..6ac85636c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,9 @@ if(CMAKE_COMPILER_IS_GNUCXX) set(GCC 1) add_definitions(-Wall) set(CMAKE_CXX_FLAGS "-std=gnu++0x ${CMAKE_CXX_FLAGS}") +elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") + add_definitions(-Wall) + set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}") endif() option(DISABLE_SSE "Disable SSE optimizations")