[arch-commits] Commit in hm/repos/community-x86_64 (5 files)
Daniel Bermond
dbermond at archlinux.org
Fri Jun 25 22:44:51 UTC 2021
Date: Friday, June 25, 2021 @ 22:44:51
Author: dbermond
Revision: 967473
archrelease: copy trunk to community-x86_64
Added:
hm/repos/community-x86_64/010-hm-disable-werror.patch
(from rev 967472, hm/trunk/010-hm-disable-werror.patch)
hm/repos/community-x86_64/PKGBUILD
(from rev 967472, hm/trunk/PKGBUILD)
Deleted:
hm/repos/community-x86_64/010-hm-use-arch-flags.patch
hm/repos/community-x86_64/020-hm-fix-build-with-gcc8.patch
hm/repos/community-x86_64/PKGBUILD
----------------------------------+
010-hm-disable-werror.patch | 11 +++
010-hm-use-arch-flags.patch | 100 ------------------------------------
020-hm-fix-build-with-gcc8.patch | 46 ----------------
PKGBUILD | 102 ++++++++++++++++++-------------------
4 files changed, 63 insertions(+), 196 deletions(-)
Copied: hm/repos/community-x86_64/010-hm-disable-werror.patch (from rev 967472, hm/trunk/010-hm-disable-werror.patch)
===================================================================
--- 010-hm-disable-werror.patch (rev 0)
+++ 010-hm-disable-werror.patch 2021-06-25 22:44:51 UTC (rev 967473)
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -68,7 +68,7 @@ endif()
+ # bb_enable_warnings( gcc -Wno-unused-variable )
+ # bb_enable_warnings( gcc-4.8 warnings-as-errors -Wno-unused-variable )
+ # for gcc 8.2:
+-bb_enable_warnings( gcc warnings-as-errors -Wno-sign-compare -Wno-class-memaccess)
++bb_enable_warnings( gcc -Wno-sign-compare -Wno-class-memaccess)
+
+ if( XCODE )
+ bb_enable_warnings( clang warnings-as-errors
Deleted: 010-hm-use-arch-flags.patch
===================================================================
--- 010-hm-use-arch-flags.patch 2021-06-25 22:44:22 UTC (rev 967472)
+++ 010-hm-use-arch-flags.patch 2021-06-25 22:44:51 UTC (rev 967473)
@@ -1,100 +0,0 @@
-diff -Naurp a/build/linux/common/makefile.base b/build/linux/common/makefile.base
---- a/build/linux/common/makefile.base 2019-06-09 14:04:51.000000000 +0000
-+++ b/build/linux/common/makefile.base 2019-06-09 14:06:58.251352310 +0000
-@@ -46,36 +46,36 @@ endif
- #########################################################
-
- # default cpp flags for all configurations
--#CPPFLAGS = -Wall $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS)
--CPPFLAGS = $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror -std=c++11
--CFLAGS = $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror
-+#CXXFLAGS = -Wall $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS)
-+CXXFLAGS += $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror -std=c++11
-+CFLAGS += $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror
-
- ##########
- # enforce 32-bit build : 1=yes, 0=no
- ##########
- M32?= 0
- ifeq ($(M32),1)
--CPPFLAGS+=-m32
-+CXXFLAGS+=-m32
- endif
- ##########
-
- ifeq ($(HIGHBITDEPTH), 1)
--CPPFLAGS+="-DRExt__HIGH_BIT_DEPTH_SUPPORT=1"
-+CXXFLAGS+="-DRExt__HIGH_BIT_DEPTH_SUPPORT=1"
- endif
-
- ifeq ($(EXTENSION_360_VIDEO), 1)
-- CPPFLAGS+=-DEXTENSION_360_VIDEO=1
-+ CXXFLAGS+=-DEXTENSION_360_VIDEO=1
- else
-- CPPFLAGS+=-DEXTENSION_360_VIDEO=0
-+ CXXFLAGS+=-DEXTENSION_360_VIDEO=0
- endif
-
- #
- # debug cpp flags
--DEBUG_CPPFLAGS = -g -D_DEBUG
-+DEBUG_CXXFLAGS = -g -D_DEBUG
- DEBUG_CFLAGS = -g -D_DEBUG
- #
- # release cpp
--RELEASE_CPPFLAGS = -O3 -Wuninitialized
-+RELEASE_CXXFLAGS = -O3 -Wuninitialized
- RELEASE_CFLAGS = -O3 -Wuninitialized
-
-
-@@ -113,7 +113,7 @@ endif
- ifeq ($(CONFIG), LIBRARY)
- # linker flags for library
- # LDFLAGS = $(ALL_LDFLAGS) -shared -Wl,-Bsymbolic
--LDFLAGS = $(ALL_LDFLAGS) -shared
-+LDFLAGS += $(ALL_LDFLAGS) -shared
- #
- # debug linker flags for library
- DEBUG_LDFLAGS = -Wl,-soname,lib$(PRJ_NAME)d.so.$(VER)
-@@ -124,7 +124,7 @@ RELEASE_LDFLAGS = -Wl,-soname,lib$(PRJ
- else
- ifeq ($(CONFIG), CONSOLE)
- # linker flags for console
--LDFLAGS = $(ALL_LDFLAGS)
-+LDFLAGS += $(ALL_LDFLAGS)
- #
- # debug linker flags for console
- DEBUG_LDFLAGS =
-@@ -208,28 +208,28 @@ $(OBJ_DIR)/%.d.o: $(SRC_DIR4)/%.asm
- # see also: http://make.paulandlesley.org/autodep.html
- # 2005-01-25 Steffen Kamp (kamp at ient.rwth-aachen.de), RWTH Aachen
- define COMPILE_AND_DEPEND_RELEASE
-- $(CPP) -c -MMD -MF $(OBJ_DIR)/$*.r.d -MT $(OBJ_DIR)/$*.r.o $(CPPFLAGS) $(RELEASE_CPPFLAGS) -o $@ $(CURDIR)/$<
-+ $(CPP) -c -MMD -MF $(OBJ_DIR)/$*.r.d -MT $(OBJ_DIR)/$*.r.o $(CXXFLAGS) $(RELEASE_CXXFLAGS) $(CPPFLAGS) -o $@ $(CURDIR)/$<
- @cp $(OBJ_DIR)/$*.r.d $(OBJ_DIR)/$*.r.P; \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $(OBJ_DIR)/$*.r.d >> $(OBJ_DIR)/$*.r.P; \
- rm -f $(OBJ_DIR)/$*.r.d
- endef
- define COMPILE_AND_DEPEND_DEBUG
-- $(CPP) -c -MMD -MF $(OBJ_DIR)/$*.d.d -MT $(OBJ_DIR)/$*.d.o $(CPPFLAGS) $(DEBUG_CPPFLAGS) -o $@ $(CURDIR)/$<
-+ $(CPP) -c -MMD -MF $(OBJ_DIR)/$*.d.d -MT $(OBJ_DIR)/$*.d.o $(CXXFLAGS) $(DEBUG_CXXFLAGS) $(CPPFLAGS) -o $@ $(CURDIR)/$<
- @cp $(OBJ_DIR)/$*.d.d $(OBJ_DIR)/$*.d.P; \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $(OBJ_DIR)/$*.d.d >> $(OBJ_DIR)/$*.d.P; \
- rm -f $(OBJ_DIR)/$*.d.d
- endef
- define COMPILE_AND_DEPEND_RELEASE_C
-- $(CC) -c -MMD -MF $(OBJ_DIR)/$*.r.d -MT $(OBJ_DIR)/$*.r.o $(CFLAGS) $(RELEASE_CFLAGS) -o $@ $(CURDIR)/$<
-+ $(CC) -c -MMD -MF $(OBJ_DIR)/$*.r.d -MT $(OBJ_DIR)/$*.r.o $(CFLAGS) $(RELEASE_CFLAGS) $(CPPFLAGS) -o $@ $(CURDIR)/$<
- @cp $(OBJ_DIR)/$*.r.d $(OBJ_DIR)/$*.r.P; \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $(OBJ_DIR)/$*.r.d >> $(OBJ_DIR)/$*.r.P; \
- rm -f $(OBJ_DIR)/$*.r.d
- endef
- define COMPILE_AND_DEPEND_DEBUG_C
-- $(CC) -c -MMD -MF $(OBJ_DIR)/$*.d.d -MT $(OBJ_DIR)/$*.d.o $(CFLAGS) $(DEBUG_CFLAGS) -o $@ $(CURDIR)/$<
-+ $(CC) -c -MMD -MF $(OBJ_DIR)/$*.d.d -MT $(OBJ_DIR)/$*.d.o $(CFLAGS) $(DEBUG_CFLAGS) $(CPPFLAGS) -o $@ $(CURDIR)/$<
- @cp $(OBJ_DIR)/$*.d.d $(OBJ_DIR)/$*.d.P; \
- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
- -e '/^$$/ d' -e 's/$$/ :/' < $(OBJ_DIR)/$*.d.d >> $(OBJ_DIR)/$*.d.P; \
Deleted: 020-hm-fix-build-with-gcc8.patch
===================================================================
--- 020-hm-fix-build-with-gcc8.patch 2021-06-25 22:44:22 UTC (rev 967472)
+++ 020-hm-fix-build-with-gcc8.patch 2021-06-25 22:44:51 UTC (rev 967473)
@@ -1,46 +0,0 @@
-diff --git a/source/Lib/TLibCommon/ContextModel.h b/source/Lib/TLibCommon/ContextModel.h
-index 5b9d7629..1ed41c55 100644
---- a/source/Lib/TLibCommon/ContextModel.h
-+++ b/source/Lib/TLibCommon/ContextModel.h
-@@ -53,12 +53,16 @@
- // Class definition
- // ====================================================================================================================
-
-+#define GCC_9_1_0_WARNING_FIX 1
-+
- /// context model class
- class ContextModel
- {
- public:
-+#if !GCC_9_1_0_WARNING_FIX
- ContextModel () { m_ucState = 0; m_binsCoded = 0; }
- ~ContextModel () {}
-+#endif
-
- UChar getState () { return ( m_ucState >> 1 ); } ///< get current state
- UChar getMps () { return ( m_ucState & 1 ); } ///< get curret MPS
-@@ -90,7 +94,11 @@ public:
- UInt getBinsCoded() { return m_binsCoded; }
-
- private:
-+#if GCC_9_1_0_WARNING_FIX
-+ UChar m_ucState = 0; ///< internal state variable
-+#else
- UChar m_ucState; ///< internal state variable
-+#endif
-
- static const UInt m_totalStates = (1 << CONTEXT_STATE_BITS) * 2; //*2 for MPS = [0|1]
- static const UChar m_aucNextStateMPS[m_totalStates];
-@@ -99,7 +107,11 @@ private:
- #if FAST_BIT_EST
- static UChar m_nextState[m_totalStates][2 /*MPS = [0|1]*/];
- #endif
-+#if GCC_9_1_0_WARNING_FIX
-+ UInt m_binsCoded = 0;
-+#else
- UInt m_binsCoded;
-+#endif
- };
-
- //! \}
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-25 22:44:22 UTC (rev 967472)
+++ PKGBUILD 2021-06-25 22:44:51 UTC (rev 967473)
@@ -1,50 +0,0 @@
-# Maintainer: Daniel Bermond <dbermond at archlinux.org>
-
-pkgname=hm
-pkgver=16.22
-pkgrel=1
-pkgdesc='HEVC Test Model - the reference software for HEVC'
-arch=('x86_64')
-url='https://hevc.hhi.fraunhofer.de/'
-license=('BSD')
-depends=('gcc-libs')
-makedepends=('cmake' 'lsb-release' 'openmp')
-source=("https://vcgit.hhi.fraunhofer.de/jct-vc/HM/-/archive/HM-${pkgver}/HM-HM-${pkgver}.tar.bz2")
-sha256sums=('b2863d480860a48472f6fe55f7488ccdaeaaac1a1ccc65b946ba643e0b6c8637')
-
-prepare() {
- cp -a "HM-HM-${pkgver}" "HM-HM-${pkgver}-highbit"
-}
-
-build() {
- cmake -B build -S "HM-HM-${pkgver}" \
- -DCMAKE_BUILD_TYPE:STRING='Release' \
- -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
- -DHIGH_BITDEPTH:BOOL='OFF' \
- -Wno-dev
- make -C build
-
- cmake -B build-highbit -S "HM-HM-${pkgver}-highbit" \
- -DCMAKE_BUILD_TYPE:STRING='Release' \
- -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
- -DHIGH_BITDEPTH:BOOL='ON' \
- -Wno-dev
- make -C build-highbit
-}
-
-package() {
- local _file
- while read -r -d '' _file
- do
- install -D -m755 "$_file" -t "${pkgdir}/usr/bin"
- done < <(find "HM-HM-${pkgver}/bin" -maxdepth 1 -type f -executable -print0)
-
- while read -r -d '' _file
- do
- install -D -m755 "HM-HM-${pkgver}-highbit/bin/${_file}" "${pkgdir}/usr/bin/${_file/Static/HighBitDepthStatic}"
- done < <(find "HM-HM-${pkgver}-highbit/bin" -maxdepth 1 -type f -executable -print0 | sed -z "s|HM\-HM\-${pkgver}\-highbit/bin||")
-
- install -D -m644 "HM-HM-${pkgver}/README" -t "${pkgdir}/usr/share/doc/${pkgname}"
- install -D -m644 "HM-HM-${pkgver}/doc"/*.pdf -t "${pkgdir}/usr/share/doc/${pkgname}"
- install -D -m644 "HM-HM-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: hm/repos/community-x86_64/PKGBUILD (from rev 967472, hm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-06-25 22:44:51 UTC (rev 967473)
@@ -0,0 +1,52 @@
+# Maintainer: Daniel Bermond <dbermond at archlinux.org>
+
+pkgname=hm
+pkgver=16.23
+pkgrel=1
+pkgdesc='HEVC Test Model - the reference software for HEVC'
+arch=('x86_64')
+url='https://hevc.hhi.fraunhofer.de/'
+license=('BSD')
+depends=('gcc-libs')
+makedepends=('cmake' 'lsb-release' 'openmp')
+source=("https://vcgit.hhi.fraunhofer.de/jct-vc/HM/-/archive/HM-${pkgver}/HM-HM-${pkgver}.tar.bz2"
+ '010-hm-disable-werror.patch')
+sha256sums=('5157839199c089c1fe47454149839caac61bc37142c1356efaf2b7d89bdee3d5'
+ '26ed4fb40812ecfce04b1301dc159fb2a575ece22a3532fe991f72e0f4e9488a')
+
+prepare() {
+ patch -d "HM-HM-${pkgver}" -Np1 -i "${srcdir}/010-hm-disable-werror.patch"
+ cp -a "HM-HM-${pkgver}" "HM-HM-${pkgver}-highbit"
+}
+
+build() {
+ cmake -B build -S "HM-HM-${pkgver}" \
+ -DCMAKE_BUILD_TYPE:STRING='Release' \
+ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+ -DHIGH_BITDEPTH:BOOL='OFF' \
+ -Wno-dev
+ make -C build
+
+ cmake -B build-highbit -S "HM-HM-${pkgver}-highbit" \
+ -DCMAKE_BUILD_TYPE:STRING='Release' \
+ -DCMAKE_INSTALL_PREFIX:PATH='/usr' \
+ -DHIGH_BITDEPTH:BOOL='ON' \
+ -Wno-dev
+ make -C build-highbit
+}
+
+package() {
+ local _file
+ while read -r -d '' _file
+ do
+ install -D -m755 "$_file" -t "${pkgdir}/usr/bin"
+ done < <(find "HM-HM-${pkgver}/bin" -maxdepth 1 -type f -executable -print0)
+
+ while read -r -d '' _file
+ do
+ install -D -m755 "HM-HM-${pkgver}-highbit/bin/${_file}" "${pkgdir}/usr/bin/${_file/Static/HighBitDepthStatic}"
+ done < <(find "HM-HM-${pkgver}-highbit/bin" -maxdepth 1 -type f -executable -print0 | sed -z "s|HM\-HM\-${pkgver}\-highbit/bin||")
+
+ install -D -m644 "HM-HM-${pkgver}/doc"/*.pdf -t "${pkgdir}/usr/share/doc/${pkgname}"
+ install -D -m644 "HM-HM-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
More information about the arch-commits
mailing list