pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/libaom Write correct version number in aom....



details:   https://anonhg.NetBSD.org/pkgsrc/rev/990b55e2e386
branches:  trunk
changeset: 314752:990b55e2e386
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Wed Nov 07 13:08:29 2018 +0000

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

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

diffstat:

 multimedia/libaom/Makefile                                |   8 +++++++-
 multimedia/libaom/distinfo                                |   3 ++-
 multimedia/libaom/patches/patch-build_cmake_version.cmake |  13 +++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diffs (55 lines):

diff -r 3e68e05f48b7 -r 990b55e2e386 multimedia/libaom/Makefile
--- a/multimedia/libaom/Makefile        Wed Nov 07 13:00:32 2018 +0000
+++ b/multimedia/libaom/Makefile        Wed Nov 07 13:08:29 2018 +0000
@@ -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_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
diff -r 3e68e05f48b7 -r 990b55e2e386 multimedia/libaom/distinfo
--- a/multimedia/libaom/distinfo        Wed Nov 07 13:00:32 2018 +0000
+++ b/multimedia/libaom/distinfo        Wed Nov 07 13:08:29 2018 +0000
@@ -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-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
diff -r 3e68e05f48b7 -r 990b55e2e386 multimedia/libaom/patches/patch-build_cmake_version.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/libaom/patches/patch-build_cmake_version.cmake Wed Nov 07 13:08:29 2018 +0000
@@ -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)



Home | Main Index | Thread Index | Old Index