[wxsvg/f28: 2/2] Merge branch 'master' into f28
by Martin Gansser
commit b7d09be4973ad446370d8e5fae384909d77479db
Merge: bdb62c2 2410808
Author: Martin Gansser <mgansser(a)online.de>
Date: Mon May 27 14:38:47 2019 +0200
Merge branch 'master' into f28
---
4 years, 10 months
[freshplayerplugin] Fix build with alsa include path.
by Vasiliy Glazov
commit 03cf5d87ff44eef2f8461d6d4dc0f45ba842570a
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Mon May 27 15:37:35 2019 +0300
Fix build with alsa include path.
freshplayerplugin.spec | 5 +++++
1 file changed, 5 insertions(+)
---
diff --git a/freshplayerplugin.spec b/freshplayerplugin.spec
index a6a85d7..e34653a 100644
--- a/freshplayerplugin.spec
+++ b/freshplayerplugin.spec
@@ -71,6 +71,11 @@ not only Firefox.
#sed -i 's|enable_3d = 1|enable_3d = 0|g' data/freshwrapper.conf.example
#sed -i 's|enable_3d = 1,|enable_3d = 0,|g' src/config.c
+# https://github.com/i-rinat/freshplayerplugin/issues/380
+sed -i 's|include_directories("${CMAKE_BINARY_DIR}")|include_directories("${CMAKE_BINARY_DIR}")\ninclude_directories("/usr/include/alsa")|' \
+ CMakeLists.txt
+
+
%build
mkdir build
cd build
4 years, 10 months
[wxsvg] Update to 3.1
by Martin Gansser
commit 24108083b3f588a34023968286d5984c6f2fe536
Author: Martin Gansser <mgansser(a)online.de>
Date: Mon May 27 13:51:19 2019 +0200
Update to 3.1
.gitignore | 1 +
sources | 2 +-
wxsvg.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 69b5e4d..3b569d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ wxsvg-1.5.5.tar.bz2
/wxsvg-1.5.12.tar.bz2
/wxsvg-1.5.15.tar.bz2
/wxsvg-1.5.16.tar.bz2
+/wxsvg-1.5.17.tar.bz2
diff --git a/sources b/sources
index 21d1c3f..a403009 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9c9381b649cebb6aceb9f1889a6fe72 wxsvg-1.5.16.tar.bz2
+f93e0aab44a57b6b7f88d89ed84a908a wxsvg-1.5.17.tar.bz2
diff --git a/wxsvg.spec b/wxsvg.spec
index 77f469b..1834c3a 100644
--- a/wxsvg.spec
+++ b/wxsvg.spec
@@ -1,6 +1,6 @@
Name: wxsvg
-Version: 1.5.16
-Release: 2%{?dist}
+Version: 1.5.17
+Release: 1%{?dist}
Summary: C++ library to create, manipulate and render SVG files
Group: System Environment/Libraries
@@ -71,6 +71,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_libdir}/pkgconfig/lib%{name}.pc
%changelog
+* Mon May 27 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 1.5.17-1
+- Update to 1.5.17
+
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.5.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
4 years, 10 months
[wxsvg/f30] Update to 1.5.17
by Martin Gansser
commit bdb62c2776a1465a1a6e9020df34edce0fb98dac
Author: Martin Gansser <mgansser(a)online.de>
Date: Mon May 27 13:29:58 2019 +0200
Update to 1.5.17
.gitignore | 1 +
sources | 2 +-
wxsvg.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 69b5e4d..3b569d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ wxsvg-1.5.5.tar.bz2
/wxsvg-1.5.12.tar.bz2
/wxsvg-1.5.15.tar.bz2
/wxsvg-1.5.16.tar.bz2
+/wxsvg-1.5.17.tar.bz2
diff --git a/sources b/sources
index 21d1c3f..a403009 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9c9381b649cebb6aceb9f1889a6fe72 wxsvg-1.5.16.tar.bz2
+f93e0aab44a57b6b7f88d89ed84a908a wxsvg-1.5.17.tar.bz2
diff --git a/wxsvg.spec b/wxsvg.spec
index 77f469b..1834c3a 100644
--- a/wxsvg.spec
+++ b/wxsvg.spec
@@ -1,6 +1,6 @@
Name: wxsvg
-Version: 1.5.16
-Release: 2%{?dist}
+Version: 1.5.17
+Release: 1%{?dist}
Summary: C++ library to create, manipulate and render SVG files
Group: System Environment/Libraries
@@ -71,6 +71,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_libdir}/pkgconfig/lib%{name}.pc
%changelog
+* Mon May 27 2019 Martin Gansser <martinkg(a)fedoraproject.org> - 1.5.17-1
+- Update to 1.5.17
+
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.5.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
4 years, 10 months
[xine-lib] Remove unneeded SDL build flags setting
by Xavier Bachelot
commit 83f1ffd732dcb78773e1323424d0bd7c1495c472
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Wed May 22 18:37:09 2019 +0200
Remove unneeded SDL build flags setting
xine-lib.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 5914616..313eeb4 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -128,7 +128,6 @@ autoreconf -ivf
%build
-export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)"
# Keep list of options in mostly the same order as ./configure --help.
%configure \
--disable-dependency-tracking \
@@ -325,6 +324,7 @@ mkdir -p %{buildroot}%{codecdir}
- Update xine-lib snapshot.
- Remove now unneeded 32 bits build fix.
- Cosmetic spec cleanup.
+- Remove unneeded SDL build flags setting.
* Fri May 17 2019 Xavier Bachelot <xavier(a)bachelot.org> 1.2.9-14.20190516hg14396
- Update to xine-lib snapshot.
4 years, 10 months
[xine-lib] Cosmetic spec cleanup
by Xavier Bachelot
commit c1fb76946e1a06e9f61a8c7931ab8fb0d1826ff4
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Wed May 22 14:28:02 2019 +0200
Cosmetic spec cleanup
xine-lib.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index 061094d..5914616 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -159,15 +159,14 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%install
%make_install
%find_lang libxine2
-cp -pR $RPM_BUILD_ROOT%{_docdir}/xine-lib __docs
-rm -rf $RPM_BUILD_ROOT%{_docdir}/xine-lib
+mv %{buildroot}%{_docdir}/xine-lib __docs
# Removing useless files
-rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine*.la __docs/README \
+rm -Rf %{buildroot}%{_libdir}/libxine*.la __docs/README \
__docs/README.{freebsd,irix,macosx,solaris,MINGWCROSS,WIN32}
# Directory for binary codecs
-mkdir -p $RPM_BUILD_ROOT%{codecdir}
+mkdir -p %{buildroot}%{codecdir}
%ldconfig_scriptlets
@@ -325,6 +324,7 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir}
* Mon May 27 2019 Xavier Bachelot <xavier(a)bachelot.org> 1.2.9-15.20190525hg14404
- Update xine-lib snapshot.
- Remove now unneeded 32 bits build fix.
+- Cosmetic spec cleanup.
* Fri May 17 2019 Xavier Bachelot <xavier(a)bachelot.org> 1.2.9-14.20190516hg14396
- Update to xine-lib snapshot.
4 years, 10 months
