CVS commit: pkgsrc/multimedia/libaom

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Wed Nov  7 13:08:29 UTC 2018

Modified Files:
        pkgsrc/multimedia/libaom: Makefile distinfo
Added Files:
        pkgsrc/multimedia/libaom/patches: patch-build_cmake_version.cmake

Log Message:
Write correct version number in aom.pc file, bump PKGREVISION

This change is required to build multimedia/ffmpwg4-4.1.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/libaom/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/libaom/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/libaom/patches/patch-build_cmake_version.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/libaom/Makefile
diff -u pkgsrc/multimedia/libaom/Makefile:1.3 pkgsrc/multimedia/libaom/Makefile:1.4
--- pkgsrc/multimedia/libaom/Makefile:1.3       Tue Oct 30 17:30:15 2018
+++ pkgsrc/multimedia/libaom/Makefile   Wed Nov  7 13:08:29 2018
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2018/10/30 17:30:15 adam Exp $
+# $NetBSD: Makefile,v 1.4 2018/11/07 13:08:29 ryoon Exp $
 
 PKGNAME=       libaom-1.0.0
+PKGREVISION=   1
 DISTNAME=      aom-d14c5bb4f336ef1842046089849dee4a301fbbf0
 CATEGORIES=    multimedia
 #MASTER_SITES= -https://aomedia.googlesource.com/aom/+archive/d14c5bb4f336ef1842046089849dee4a301fbbf0.tar.gz
@@ -16,6 +17,11 @@ USE_CMAKE=   yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    perl
 
+SUBST_CLASSES+=                version
+SUBST_FILES.version=   build/cmake/version.cmake
+SUBST_STAGE.version=   pre-configure
+SUBST_VARS.version=    PKGVERSION_NOREV
+
 CONFIGURE_DIRS=        build
 CMAKE_ARG_PATH=        ../
 CMAKE_ARGS+=   -DBUILD_SHARED_LIBS:BOOL=ON

Index: pkgsrc/multimedia/libaom/distinfo
diff -u pkgsrc/multimedia/libaom/distinfo:1.4 pkgsrc/multimedia/libaom/distinfo:1.5
--- pkgsrc/multimedia/libaom/distinfo:1.4       Tue Oct 30 17:30:15 2018
+++ pkgsrc/multimedia/libaom/distinfo   Wed Nov  7 13:08:29 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2018/10/30 17:30:15 adam Exp $
+$NetBSD: distinfo,v 1.5 2018/11/07 13:08:29 ryoon Exp $
 
 SHA1 (aom-d14c5bb4f336ef1842046089849dee4a301fbbf0.tar.gz) = deaf4f5420055cba0385a4e7dd91720211b7b97d
 RMD160 (aom-d14c5bb4f336ef1842046089849dee4a301fbbf0.tar.gz) = 3f01d1408b715acb54537ba933bac4e03bc4f157
@@ -8,3 +8,4 @@ SHA1 (patch-aom_exports__com) = 23e24008
 SHA1 (patch-build_cmake_aom__configure.cmake) = e0dbccb5dd1b6137ff29f915a221fbae1c56b49b
 SHA1 (patch-build_cmake_aom__optimization.cmake) = 56eda2e9e40cd20ce955ca311ded4a11f2ae3d1c
 SHA1 (patch-build_cmake_exports.cmake) = b64a36404b96a8ede42ac7419c28d2075c910395
+SHA1 (patch-build_cmake_version.cmake) = 37bf922fbf2a1aa412d2a47c054f42cff38ad4c3

Added files:

Index: pkgsrc/multimedia/libaom/patches/patch-build_cmake_version.cmake
diff -u /dev/null pkgsrc/multimedia/libaom/patches/patch-build_cmake_version.cmake:1.1
--- /dev/null   Wed Nov  7 13:08:29 2018
+++ pkgsrc/multimedia/libaom/patches/patch-build_cmake_version.cmake    Wed Nov  7 13:08:29 2018
@@ -0,0 +1,13 @@
+$NetBSD: patch-build_cmake_version.cmake,v 1.1 2018/11/07 13:08:29 ryoon Exp $
+
+--- build/cmake/version.cmake.orig     2018-10-01 03:20:05.000000000 +0000
++++ build/cmake/version.cmake
+@@ -36,7 +36,7 @@ if(EXISTS "${GIT_EXECUTABLE}")
+ endif()
+ 
+ if("${aom_version}" STREQUAL "")
+-  set(aom_version "${AOM_ROOT}/CHANGELOG")
++  set(aom_version "@PKGVERSION_NOREV@")
+ endif()
+ 
+ unset(last_aom_version)