[meka] Updated to a new upstream preview of version 0.80 Spec file clean up
by Andrea Musuruane
commit 46bceb426d1ceea2bf013238ee0053d847d379cf
Author: Andrea Musuruane <musuruan(a)gmail.com>
Date: Sat Dec 14 15:17:24 2019 +0100
Updated to a new upstream preview of version 0.80
Spec file clean up
.gitignore | 1 +
meka.spec | 42 ++++++++++++------------------------------
sources | 2 +-
3 files changed, 14 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd03c6d..f46b392 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
meka-2014-10-05-srcs.zip
/meka-0.80-f55fcdd.tar.gz
+/meka-0.80-9a40240.tar.gz
diff --git a/meka.spec b/meka.spec
index ed36193..c828b65 100644
--- a/meka.spec
+++ b/meka.spec
@@ -1,9 +1,9 @@
-%global commit f55fcdd96f1ad43f01d2645f4cd7fe0b9c5c6870
+%global commit 9a40240c5ce3ac800aab83cb49f7f6dd00619b38
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: meka
Version: 0.80
-Release: 0.15.20150506git%{?dist}
+Release: 0.16.20191213git%{?dist}
Summary: Sega 8-bit emulator with debugging/hacking tools
License: MEKA and non-commercial
@@ -25,6 +25,7 @@ BuildRequires: ImageMagick
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
Requires: grimmer-proggy-tinysz-fonts
+Requires: grimmer-proggy-squaresz-fonts
%description
MEKA is a multi machine emulator, originally started as a Sega Master System
@@ -47,9 +48,6 @@ And if you are, I doubt you will want to play Nintendo games. So forget it.
%prep
%setup -q -n %{name}-%{commit}/%{name}
-# Remove boundled libs
-rm -rf libs
-
# Fix end-of-line-encoding
sed -i 's/\r//' *.txt
@@ -59,23 +57,14 @@ for i in *.txt; do
mv $i.utf8 $i
done
-# Fix linking
-sed -i 's/allegro_primitives-5.0`/allegro_primitives-5.0 allegro_ttf-5.0`/' srcs/Makefile
-
# Fix linking with allegro5
sed -i 's/pkg-config --cflags --libs allegro-5.0 allegro_image-5.0 allegro_audio-5.0 allegro_font-5.0 allegro_primitives-5.0 allegro_ttf-5.0/pkg-config --cflags --libs allegro-5 allegro_image-5 allegro_audio-5 allegro_font-5 allegro_primitives-5 allegro_ttf-5/' srcs/Makefile
-# Compile for unix
-sed -i 's/SYSTEM = macosx/# SYSTEM = macosx/' srcs/Makefile
-sed -i 's/# SYSTEM = unix/SYSTEM = unix/' srcs/Makefile
-
-
%build
cd srcs
-export CFLAGS="%{optflags}"
-# make doesn't compile with %%{?_smp_mflags}
-make
+%set_build_flags
+%make_build
%install
@@ -105,20 +94,9 @@ rm %{buildroot}%{_datadir}/%{name}/Data/fonts/ProggyTinySZ.ttf
ln -s %{_datadir}/fonts/grimmer-proggy-tinysz/ProggyTinySZ.ttf \
%{buildroot}%{_datadir}/%{name}/Data/fonts/ProggyTinySZ.ttf
-
-%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-
-%postun
-if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+rm %{buildroot}%{_datadir}/%{name}/Data/fonts/ProggySquareSZ.ttf
+ln -s %{_datadir}/fonts/grimmer-proggy-squaresz/ProggySquareSZ.ttf \
+ %{buildroot}%{_datadir}/%{name}/Data/fonts/ProggySquareSZ.ttf
%files
@@ -133,6 +111,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Sat Dec 14 2019 Andrea Musuruane <musuruan(a)gmail.com> - 0.80-0.16.20191213git
+- Updated to a new upstream preview of version 0.80
+- Spec file clean up
+
* Sat Aug 10 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.80-0.15.20150506git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
diff --git a/sources b/sources
index ee79fcc..f06c2c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05ea5c29d1d01ab93b0adbd29d509fad meka-0.80-f55fcdd.tar.gz
+SHA512 (meka-0.80-9a40240.tar.gz) = a78f323341c16ada8040278df1c70612b5b7d6eeb2d0d5d41601c803310a9172a884787712d0dbd7a479839d251ad0dbacb1a26fd54adf50d4299bf2f137d2e5
4 years, 11 months
[chromium-freeworld/f30] Enable: System minizip in f30
by hellbanger
commit 356aee774a3b1d2bbc19c93d0ed6d0f4ef9f2800
Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
Date: Sat Dec 14 17:55:17 2019 +0530
Enable: System minizip in f30
chromium-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 2038e52..2628213 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -54,7 +54,7 @@
%bcond_with system_ffmpeg
#Allow minizip to be unbundled
#mini-compat is going to be removed from fedora 30!
-%bcond_with system_minizip
+%bcond_without system_minizip
%endif
# Need re2 ver. 2016.07.21 for re2::LazyRE2
4 years, 11 months
[chromium-freeworld/f30: 6/6] Merge branch 'master' into f30
by hellbanger
commit 6ac3e5853a6b369c66cf2f69213e165114eef3d2
Merge: e161321 7e4ad08
Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
Date: Sat Dec 14 16:42:48 2019 +0530
Merge branch 'master' into f30
chromium-79.0.3945.56-glibc-clock-nanosleep.patch | 52 +++++++++++++
chromium-fix-use_system_harfbuzz-ng.patch | 44 +++++++++++
chromium-freeworld.spec | 90 +++++++++++++++--------
chromium-system-icu.patch | 34 +++++----
fix-spammy-unique-font-matching-log.patch | 13 ++++
icu65.patch | 64 ++++++++++++++++
include-algorithm-to-use-std-lower_bound.patch | 49 ++++++++++++
launch_manager.h-uses-std-vector.patch | 36 +++++++++
sources | 2 +-
widevine.patch | 33 +++------
10 files changed, 350 insertions(+), 67 deletions(-)
---
4 years, 11 months
[chromium-freeworld/f30] (6 commits) ...Merge branch 'master' into f30
by hellbanger
Summary of changes:
ecef62a... Fix: Symbols still present even after adding -g0 (*)
d0b6e27... Disabled fedora build flags to reduce binary size. (*)
5405570... Added building with clang back to the spec Removed hard cod (*)
7243aac... Update to 79.0.3945.79 (*)
7e4ad08... Fix: Building with system harfbuzz (*)
6ac3e58... Merge branch 'master' into f30
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
[chromium-freeworld] Fix: Building with system harfbuzz
by hellbanger
commit 7e4ad0893402265ef49bc9462385636c99436f12
Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
Date: Sat Dec 14 08:43:07 2019 +0530
Fix: Building with system harfbuzz
chromium-fix-use_system_harfbuzz-ng.patch | 44 +++++++++++++++++++++++++++++++
chromium-freeworld.spec | 3 ++-
2 files changed, 46 insertions(+), 1 deletion(-)
---
diff --git a/chromium-fix-use_system_harfbuzz-ng.patch b/chromium-fix-use_system_harfbuzz-ng.patch
new file mode 100644
index 0000000..383aa0a
--- /dev/null
+++ b/chromium-fix-use_system_harfbuzz-ng.patch
@@ -0,0 +1,44 @@
+From ea7a9bad96f921da314ab8d171b1e22ad19d49a7 Mon Sep 17 00:00:00 2001
+From: ckitagawa <ckitagawa(a)chromium.org>
+Date: Tue, 22 Oct 2019 14:31:41 +0000
+Subject: [PATCH] [Build] fix use_system_harfbuzz-ng
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Use <> for harfbuzz includes to support the option to build with system
+harfbuzz rather than the version in third_party.
+
+Bug: 1016158
+Change-Id: I8a85e928c010ca65e04b5ebc4909a051b4312672
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1873236
+Commit-Queue: Calder Kitagawa <ckitagawa(a)chromium.org>
+Commit-Queue: Dominik Röttsches <drott(a)chromium.org>
+Reviewed-by: Dominik Röttsches <drott(a)chromium.org>
+Cr-Commit-Position: refs/heads/master@{#708176}
+---
+ components/paint_preview/common/subset_font.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc
+index a218d6373350..287f5600ce9b 100644
+--- a/components/paint_preview/common/subset_font.cc
++++ b/components/paint_preview/common/subset_font.cc
+@@ -7,11 +7,12 @@
+ #include <memory>
+ #include <utility>
+
++#include <hb-subset.h>
++#include <hb.h>
++
+ #include "base/bind.h"
+ #include "base/callback.h"
+ #include "base/macros.h"
+-#include "third_party/harfbuzz-ng/src/src/hb-subset.h"
+-#include "third_party/harfbuzz-ng/src/src/hb.h"
+ #include "third_party/skia/include/core/SkStream.h"
+ #include "third_party/skia/include/core/SkTypeface.h"
+
+--
+2.23.0
+
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index b07294e..2038e52 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -237,6 +237,8 @@ Patch73: launch_manager.h-uses-std-vector.patch
Patch74: chromium-79.0.3945.56-glibc-clock-nanosleep.patch
# ICU ver. 65 support on Rawhide
Patch75: icu65.patch
+#Fix building with system harfbuzz
+Patch76: chromium-fix-use_system_harfbuzz-ng.patch
%description
@@ -752,7 +754,6 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%dir %{chromiumdir}/swiftshader
%{chromiumdir}/swiftshader/libEGL.so
%{chromiumdir}/swiftshader/libGLESv2.so
-%{chromiumdir}/swiftshader/libvk_swiftshader.so
#########################################changelogs#################################################
%changelog
* Fri Dec 13 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> - 79.0.3945.79-1
4 years, 11 months
[xine-lib] 1.2.10
by Xavier Bachelot
commit d7b210ef555a543fe129d7875de9329d45f655ec
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Sat Dec 14 01:00:12 2019 +0100
1.2.10
.gitignore | 1 +
sources | 2 +-
xine-lib.spec | 17 +++++++++++------
3 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 45bb595..da03fe6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ xine-lib-1.2.6.tar.xz
/xine-lib-1.2.9-20190516hg14396.tar.xz
/xine-lib-1.2.9-20190525hg14404.tar.xz
/xine-lib-1.2.9-20190831hg14506.tar.xz
+/xine-lib-1.2.10.tar.xz
diff --git a/sources b/sources
index f539f05..17e55ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff4d0480195504d3c61aeb98fef5b08e xine-lib-1.2.9-20190831hg14506.tar.xz
+SHA512 (xine-lib-1.2.10.tar.xz) = 1cbe033da606d67a0a59f19968b2fe1cb46eaeb32c4b4aca7b91125b7230e15bd36d1e3e39e48e6eda56e556018f9f9bf84acb0012d3dd634306e7110fdc4c5f
diff --git a/xine-lib.spec b/xine-lib.spec
index e66e082..83436dc 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -1,4 +1,4 @@
-%global plugin_abi 2.7
+%global plugin_abi 2.8
%global codecdir %{_libdir}/codecs
%if 0%{?el6}
@@ -29,14 +29,14 @@
%global have_vidix 0
%endif # ix86
-%global snapshot 1
-%global date 20190831
-%global revision 14506
+#global snapshot 1
+#global date 20190831
+#global revision 14506
Summary: A multimedia engine
Name: xine-lib
-Version: 1.2.9
-Release: 22%{?snapshot:.%{date}hg%{revision}}%{?dist}
+Version: 1.2.10
+Release: 1%{?snapshot:.%{date}hg%{revision}}%{?dist}
License: GPLv2+
URL: http://www.xine-project.org/
%if ! 0%{?snapshot}
@@ -339,6 +339,11 @@ mkdir -p %{buildroot}%{codecdir}
%changelog
+* Fri Dec 13 2019 Xavier Bachelot <xavier(a)bachelot.org> 1.2.10-1
+- Update to 1.2.10.
+- Enable aom for EL7.
+- Enable libcaca and ImageMagick for EL8.
+
* Fri Nov 15 2019 Dominik 'Rathann' Mierzejewski <rpm(a)greysector.net> - 1.2.9-22.20190831hg14506
- rebuild for libdvdread ABI bump
4 years, 11 months
[xine-lib] Enable aom for EL7 and libcaca and ImageMagick for EL8
by Xavier Bachelot
commit 023b180764a178cdc1f4696d32fbf0d4bcb5d17c
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Sat Dec 14 00:26:42 2019 +0100
Enable aom for EL7 and libcaca and ImageMagick for EL8
xine-lib.spec | 6 ------
1 file changed, 6 deletions(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 24cc18f..e66e082 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -11,16 +11,10 @@
%endif
%if 0%{?el7}
- %global _without_aom 1
%global _without_dav1d 1
%global _without_png 1
%endif
-%if 0%{?el8}
- %global _without_caca 1
- %global _without_imagemagick 1
-%endif
-
%if 0%{?fc29}%{?fc30}
%global _without_dav1d 1
%endif
4 years, 11 months