From 87c3b43fd8ad86ae55df3e17bccb12e5a2e31346 Mon Sep 17 00:00:00 2001 From: Adrien Bertrand Date: Sat, 22 Jun 2019 17:20:44 +0800 Subject: [PATCH] [build] OBS file updates for v1.3 Also add GCC 9 and 9 tests/exports --- obs/PKGBUILD | 4 ++-- obs/_service | 4 ++-- obs/cemu.changes | 5 +++++ obs/cemu.dsc | 2 +- obs/cemu.spec | 8 ++++++-- obs/debian.changelog | 7 +++++++ obs/debian.control | 2 +- obs/debian.rules | 7 ++++--- 8 files changed, 28 insertions(+), 11 deletions(-) diff --git a/obs/PKGBUILD b/obs/PKGBUILD index 54ac37136..eee0c0331 100644 --- a/obs/PKGBUILD +++ b/obs/PKGBUILD @@ -1,5 +1,5 @@ pkgname=cemu -pkgver=1.2 +pkgver=1.3 pkgrel=0 pkgdesc='TI-84 Plus CE / TI-83 Premium CE emulator.' arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ build() { cd gui/qt/capture/libpng-apng && ./configure --with-libpng-prefix=a --enable-static --disable-shared CFLAGS="-O2 -fPIC" && make libpng16.la && cd ../../../.. mkdir -p build cd build - qmake ../gui/qt/CEmu.pro CEMU_VERSION=v1.2 USE_LIBPNG=internal TARGET_NAME=cemu + qmake ../gui/qt/CEmu.pro CEMU_VERSION=v1.3 USE_LIBPNG=internal TARGET_NAME=cemu make } diff --git a/obs/_service b/obs/_service index fcd0a433b..6d12e496d 100644 --- a/obs/_service +++ b/obs/_service @@ -3,8 +3,8 @@ https://github.com/CE-Programming/CEmu.git git CEmu - f654cb8 - 1.2 + fb53891 + 1.3 *.tar diff --git a/obs/cemu.changes b/obs/cemu.changes index 7c63b2d25..c2130f70d 100644 --- a/obs/cemu.changes +++ b/obs/cemu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jun 22 08:12:30 UTC 2019 - bertrand.adrien@gmail.com + +- v1.3: Several improvements, bugfixes, minor additions (see GitHub) + ------------------------------------------------------------------- Mon Dec 10 17:03:30 UTC 2018 - bertrand.adrien@gmail.com diff --git a/obs/cemu.dsc b/obs/cemu.dsc index aa095ae79..eb13040e6 100644 --- a/obs/cemu.dsc +++ b/obs/cemu.dsc @@ -1,7 +1,7 @@ Format: 3.0 (quilt) Source: cemu Binary: cemu -Version: 1.2-0 +Version: 1.3-0 Architecture: any Maintainer: Adrien Bertrand Homepage: https://github.com/CE-Programming/CEmu diff --git a/obs/cemu.spec b/obs/cemu.spec index 255d52693..48b250d2f 100644 --- a/obs/cemu.spec +++ b/obs/cemu.spec @@ -18,7 +18,7 @@ %global debug_package %{nil} Name: cemu -Version: 1.2 +Version: 1.3 Release: 0 Summary: TI-84 Plus CE / TI-83 Premium CE emulator License: GPL-3.0 @@ -94,8 +94,12 @@ test -x "$(type -p gcc-6)" && export CC=gcc-6 test -x "$(type -p g++-6)" && export CXX=g++-6 test -x "$(type -p gcc-7)" && export CC=gcc-7 test -x "$(type -p g++-7)" && export CXX=g++-7 +test -x "$(type -p gcc-8)" && export CC=gcc-8 +test -x "$(type -p g++-8)" && export CXX=g++-8 +test -x "$(type -p gcc-9)" && export CC=gcc-9 +test -x "$(type -p g++-9)" && export CXX=g++-9 cd gui/qt/capture/libpng-apng && ./configure --with-libpng-prefix=a --enable-static --disable-shared CFLAGS="-O2 -fPIC" && make libpng16.la && cd ../../../.. -qmake-qt5 QMAKE_CC="$CC" QMAKE_CXX="$CXX" QMAKE_LINK="$CXX" gui/qt/CEmu.pro CEMU_VERSION=v1.2 USE_LIBPNG=internal TARGET_NAME=cemu +qmake-qt5 QMAKE_CC="$CC" QMAKE_CXX="$CXX" QMAKE_LINK="$CXX" gui/qt/CEmu.pro CEMU_VERSION=v1.3 USE_LIBPNG=internal TARGET_NAME=cemu make %{?_smp_mflags} %install diff --git a/obs/debian.changelog b/obs/debian.changelog index bc65e0a69..1f3137802 100644 --- a/obs/debian.changelog +++ b/obs/debian.changelog @@ -1,3 +1,10 @@ +cemu (1.3-0) unstable; urgency=low + + * Several improvements, bugfixes, minor additions (see GitHub) + + -- Adrien Bertrand Sat, 22 Jun 2019 15:12:30 +0800 + + cemu (1.2-0) unstable; urgency=low * Several improvements, bugfixes, minor additions (see GitHub) diff --git a/obs/debian.control b/obs/debian.control index 1e5cf2ae7..f772a3d79 100644 --- a/obs/debian.control +++ b/obs/debian.control @@ -1,5 +1,5 @@ Source: cemu -Section: sectionName +Section: devel Priority: optional Maintainer: Adrien Bertrand Homepage: https://github.com/CE-Programming/CEmu diff --git a/obs/debian.rules b/obs/debian.rules index e2199d95b..0d6416dfa 100644 --- a/obs/debian.rules +++ b/obs/debian.rules @@ -14,14 +14,15 @@ else CFLAGS += -O2 endif +CEMU_VERNUM = 1.3 + build: build-stamp build-stamp: dh_testdir # Add here commands to compile the package. - echo $PWD - cd gui/qt/capture/libpng-apng && ./configure --with-libpng-prefix=a --enable-static --disable-shared CFLAGS="-O2 -fPIC" && make libpng16.la && cd ../../../.. - qmake gui/qt/CEmu.pro CEMU_VERSION=v1.2 USE_LIBPNG=internal TARGET_NAME=cemu + cd cemu-$(CEMU_VERNUM)/gui/qt/capture/libpng-apng && ./configure --with-libpng-prefix=a --enable-static --disable-shared CFLAGS="-O2 -fPIC" && make libpng16.la && cd ../../../../.. + qmake cemu-$(CEMU_VERNUM)/gui/qt/CEmu.pro CEMU_VERSION=v$(CEMU_VERNUM) USE_LIBPNG=internal TARGET_NAME=cemu make # --- end custom part for compiling