[dvbcut] Update to 0.7.3
by Sérgio M. Basto
commit 623cb87258b5d3f2bdace3db9cbb1c392b6f9a16
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Dec 19 01:24:51 2021 +0000
Update to 0.7.3
.gitignore | 1 +
dvbcut-appicon.patch | 13 +++++
dvbcut-locale.patch | 14 +++++
dvbcut-use_pkgconfig.patch | 43 +++++++++++++++
dvbcut.spec | 127 +++++++++++++++++----------------------------
sources | 2 +-
6 files changed, 119 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 112f430..96608ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
dvbcut-svn179.tar.bz2
+/dvbcut-0.7.3.tar.gz
diff --git a/dvbcut-appicon.patch b/dvbcut-appicon.patch
new file mode 100644
index 0000000..c99ead6
--- /dev/null
+++ b/dvbcut-appicon.patch
@@ -0,0 +1,13 @@
+Index: dvbcut-deb-0.7.3/dvbcut.desktop.in
+===================================================================
+--- dvbcut-deb-0.7.3.orig/dvbcut.desktop.in
++++ dvbcut-deb-0.7.3/dvbcut.desktop.in
+@@ -7,7 +7,7 @@ GenericName[de]=DVB-Schnittprogramm für
+ NoDisplay=false
+ Comment=Trim and cut video MPEG2 transport streams into multiple export formats
+ Comment[de]=Kürze und schneide MPEG Tranport Ströme in verschiedene Exportformate
+-Icon=@prefix(a)/share/dvbcut/icons/dvbcut.svg
++Icon=dvbcut
+ TryExec=@prefix@/bin/dvbcut
+ Exec=@prefix@/bin/dvbcut %F
+ Terminal=false
diff --git a/dvbcut-locale.patch b/dvbcut-locale.patch
new file mode 100644
index 0000000..c26be70
--- /dev/null
+++ b/dvbcut-locale.patch
@@ -0,0 +1,14 @@
+Index: dvbcut-deb-0.7.2/src/Makefile.in
+===================================================================
+--- dvbcut-deb-0.7.2.orig/src/Makefile.in
++++ dvbcut-deb-0.7.2/src/Makefile.in
+@@ -104,6 +104,9 @@ check:
+
+ install: all installdirs
+ $(INSTALL_PROGRAM) dvbcut$(EXEEXT) $(DESTDIR)$(bindir)
++ $(INSTALL_DATA) dvbcut.qm $(DESTDIR)$(helpdir)
++ $(INSTALL_DATA) dvbcut_cs.qm $(DESTDIR)$(helpdir)
++ $(INSTALL_DATA) dvbcut_de.qm $(DESTDIR)$(helpdir)
+ $(INSTALL_DATA) dvbcut_cs.html $(DESTDIR)$(helpdir)
+ $(INSTALL_DATA) dvbcut_en.html $(DESTDIR)$(helpdir)
+ $(INSTALL_DATA) dvbcut_de.html $(DESTDIR)$(helpdir)
diff --git a/dvbcut-use_pkgconfig.patch b/dvbcut-use_pkgconfig.patch
new file mode 100644
index 0000000..6bd50f3
--- /dev/null
+++ b/dvbcut-use_pkgconfig.patch
@@ -0,0 +1,43 @@
+Index: dvbcut-deb-0.7.2/configure.ac
+===================================================================
+--- dvbcut-deb-0.7.2.orig/configure.ac
++++ dvbcut-deb-0.7.2/configure.ac
+@@ -43,12 +43,35 @@ done
+
+ dnl Checks for libraries.
+
+-FFMPEG_LIBS='-lavformat -lavcodec -lavutil'
+ AC_SUBST(FFMPEG_LIBS)
+
++AC_CHECK_LIB(avformat, main,
++ [HAVE_FFMPEG="yes"],
++ [AC_MSG_ERROR([libavformat library not found])])
++
++AC_CHECK_LIB(avcodec, main,
++ [HAVE_FFMPEG="yes"],
++ [AC_MSG_ERROR([libavcodec library not found])])
++
++AC_CHECK_LIB(avutil, main,
++ [HAVE_FFMPEG="yes"],
++ [AC_MSG_ERROR([libavutil library not found])])
++
+ AC_CHECK_LIB(swscale, main,
+- [AC_DEFINE(HAVE_LIB_SWSCALE, 1, [Define this if you have libswscale.])
+- FFMPEG_LIBS="$FFMPEG_LIBS -lswscale"])
++ [HAVE_SWSCALE="yes"],
++ [AC_MSG_ERROR([libswscale library not found])])
++
++if test "x$HAVE_FFMPEG" = "xyes"; then
++ FFMPEG_LIBS="`$PKG_CONFIG --libs libavformat libavcodec libavutil`"
++ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libavformat libavcodec libavutil`"
++ if test "x$HAVE_SWSCALE" = "xyes"; then
++ AC_DEFINE(HAVE_LIB_SWSCALE, 1, [Define this if you have libswscale.])
++ FFMPEG_LIBS="$FFMPEG_LIBS `$PKG_CONFIG --libs libswscale`"
++ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags libswscale`"
++ fi
++else
++ AC_MSG_ERROR([cannot find ffmpeg libraries])
++fi
+
+ AC_CHECK_LIB(mad, mad_decoder_init,
+ [AC_DEFINE(HAVE_LIB_MAD, 1, [Define this if you have libmad.])
diff --git a/dvbcut.spec b/dvbcut.spec
index 2f1adfe..a06b4ed 100644
--- a/dvbcut.spec
+++ b/dvbcut.spec
@@ -1,124 +1,89 @@
%define svnrev 179
Name: dvbcut
-Version: 0.6.1
-Release: 37.svn%{svnrev}%{?dist}
+Version: 0.7.3
+Release: 1%{?dist}
Summary: Clip and convert DVB transport streams to MPEG2 program streams
Group: Applications/Multimedia
License: GPLv2+ and LGPLv2
-URL: http://dvbcut.sourceforge.net/
-# fixes were committed to svn since release, so using svn checkout for latest fixes:
-# original upstream archive location:
-#Source0: http://downloads.sourceforge.net/dvbcut/dvbcut_% {version}.tar.bz2
# current upstream release location:
-#Source0: http://www.mr511.de/dvbcut/dvbcut-0.6.1.tar.gz
+URL: https://github.com/bernhardu/dvbcut-deb
# use sh dvbcut-snapshot.sh to create the archive
-Source0: %{name}-svn%{svnrev}.tar.bz2
-# This desktop file was created by hand.
-Source5: %{name}-snapshot.sh
-Source6: %{name}-servicemenu.desktop
-# helpfile is placed in /usr/share/help. Look for it under /usr/share/dvbcut instead
-Patch0: %{name}-fix-help-path.patch
-Patch1: %{name}-svn176-fix-make-install.patch
-Patch2: %{name}-svn176-fix-help-install-path.patch
-Patch3: %{name}-svn176-desktop-additions.patch
-Patch6: %{name}-179-vs-ubuntu-12.04.diff
-Patch7: %{name}-svn179-ffmpeg-0.11.1.patch
-Patch8: %{name}-svn179-ffmpeg-2.0-compatibility.patch
-Patch9: %{name}-svn179-ffmpeg-2.4.3-compatibility.patch
-Patch10: %{name}-svn179-ffmpeg-3.0.3-compatibility.patch
-Patch11: ffmpeg35_buildfix.patch
+Source0: https://github.com/bernhardu/dvbcut-deb/archive/v%{version}/%{name}-%{ver...
+# PATCH-FIX-OPENSUSE dvbcut-use_pkgconfig.patch aloisio(a)gmx.com -- use pkgconfig for ffmpeg libraries
+Patch1: dvbcut-use_pkgconfig.patch
+# PATCH-FIX-OPENSUSE dvbcut-appicon-patch aloisio(a)gmx.com -- install icon in the proper path
+Patch3: dvbcut-appicon.patch
+# PATCH-FIX-OPENSUSE dvbcut-locale.patch aloisio(a)gmx.com -- also install .qm locale files
+Patch4: dvbcut-locale.patch
BuildRequires: autoconf
+BuildRequires: libtool
BuildRequires: gcc-c++
-BuildRequires: qt3-devel
-BuildRequires: libao-devel
-BuildRequires: a52dec-devel
+BuildRequires: libao-devel
+BuildRequires: a52dec-devel
+BuildRequires: hicolor-icon-theme
+BuildRequires: qt5-linguist
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5Xml)
+BuildRequires: pkgconfig(ao)
BuildRequires: libmad-devel
BuildRequires: ffmpeg-devel
BuildRequires: desktop-file-utils
-BuildRequires: kde-filesystem
Requires: hicolor-icon-theme
# mplayer not actually required, but much better with it.
Requires: mplayer
-Requires: kde-filesystem
+
%description
-dvbcut is a Qt application that allows you to select certain parts of an MPEG
+DVBcut is a Qt application that allows you to select certain parts of an MPEG
transport stream (as received via Digital Video Broadcasting, DVB) and save
these parts into a single MPEG output file. It follows a "keyhole surgery"
approach where the input video and audio data is mostly kept unchanged, and
-only very few frames at the beginning and/or end of the selected range are
+only very few frames at the beginning and/or end of the selected range are
re-encoded in order to obtain a valid MPEG file. For MPEG video playback
dvbcut can use Mplayer if available.
%prep
-# for release archive
-#%#setup -q
-# for svn tag
-%setup -q -n %{name}-svn%{svnrev}
-%patch0 -b .fix-help-path
-%patch1 -b .fix-make-install
-%patch2 -b .fix-help-install
-%patch3 -b .desktop-improvements
-%patch6 -b .ubuntu
-%patch7 -p1 -b .ffmpeg-0.11.1
-%patch8 -b .ffmpeg-2.0
-%patch9 -p1 -b .ffmpeg-2.4.3
-%patch10 -p1 -b .ffmpeg-3.0.3
-%patch11 -p1 -b .ffmpeg35
-
-# Fix QTDIR libs in configure
-sed -i 's,$QTDIR/$mr_libdirname,$QTDIR/lib,' configure.in
-
-# Avoid stripping binaries
-sed -i 's,$(STRIP) $(topdir)/bin/dvbcut$(EXEEXT),,' src/Makefile.in
-
-# don't try to make Debian and ffmpeg files that have been stripped
-sed -i '/debian/d' DISTFILES
-sed -i '/ffmpeg.src/d' DISTFILES
-
-# fix desktop file
-sed -i -e 's|@prefix(a)/share/dvbcut/icons/dvbcut.svg|dvbcut|g' dvbcut.desktop.in
+%setup -q -n %{name}-deb-%{version}
+%patch1 -p1
+%patch3 -p1
+%patch4 -p1
%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-autoconf
-%configure --with-ffmpeg=%{_prefix} \
- --with-ffmpeg-include=%{_includedir}/ffmpeg
- helpdir=%{_datadir}/%{name}
-
-# It does not compile with smp_mflags
-make
+autoreconf -i
+%configure
+
+%make_build
%install
%make_install
-mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor="" \
- --dir %{buildroot}%{_datadir}/applications dvbcut.desktop
-mkdir -p %{buildroot}%{_kde4_datadir}/kde4/services/
-cp %{SOURCE6} %{buildroot}%{_kde4_datadir}/kde4/services/
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+update-desktop-database &> /dev/null || :
-%post
-/usr/bin/update-desktop-database &> /dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-/usr/bin/update-desktop-database &> /dev/null || :
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+update-desktop-database &> /dev/null || :
+
%files
%doc ChangeLog CREDITS README README.icons
@@ -127,12 +92,14 @@ fi
%{_mandir}/man1/%{name}.1.gz
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%{_datadir}/%{name}/dvbcut_*.html
-%{_kde4_datadir}/kde4/services/*.desktop
+%{_datadir}/%{name}
%{_datadir}/mime/packages/dvbcut.xml
%changelog
+* Sun Dec 19 2021 Sérgio Basto <sergio(a)serjux.com> - 0.7.3-1
+- Update to 0.7.3
+
* Thu Nov 11 2021 Leigh Scott <leigh123linux(a)gmail.com> - 0.6.1-37.svn179
- Rebuilt for new ffmpeg snapshot
diff --git a/sources b/sources
index 947f4bb..6a70af9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-467975975bc7bf6abcb559449e776654 dvbcut-svn179.tar.bz2
+SHA512 (dvbcut-0.7.3.tar.gz) = 9473bc4d8dcd16f44ed25e586aacff6467a7b0530c3613a6f856d21cb2767991187a405b63a0ac4f4a130eaf0e7cd4697b440a57f29142186ff08fe923cd4580
2 years, 4 months
[dvbcut] Delete old patches and scripts
by Sérgio M. Basto
commit 1ac0ed86f653cea61cef846afb84eff49b8b0da8
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Dec 19 01:28:11 2021 +0000
Delete old patches and scripts
deleted: dvbcut-179-vs-ubuntu-12.04.diff
deleted: dvbcut-fix-help-path.patch
deleted: dvbcut-servicemenu.desktop
deleted: dvbcut-snapshot.sh
deleted: dvbcut-svn176-desktop-additions.patch
deleted: dvbcut-svn176-fix-help-install-path.patch
deleted: dvbcut-svn176-fix-make-install.patch
deleted: dvbcut-svn179-ffmpeg-0.11.1.patch
deleted: dvbcut-svn179-ffmpeg-2.0-compatibility.patch
deleted: dvbcut-svn179-ffmpeg-2.4.3-compatibility.patch
deleted: dvbcut-svn179-ffmpeg-3.0.3-compatibility.patch
dvbcut-179-vs-ubuntu-12.04.diff | 142 ---
dvbcut-fix-help-path.patch | 11 -
dvbcut-servicemenu.desktop | 15 -
dvbcut-snapshot.sh | 47 -
dvbcut-svn176-desktop-additions.patch | 21 -
dvbcut-svn176-fix-help-install-path.patch | 11 -
dvbcut-svn176-fix-make-install.patch | 29 -
dvbcut-svn179-ffmpeg-0.11.1.patch | 88 --
dvbcut-svn179-ffmpeg-2.0-compatibility.patch | 101 ---
dvbcut-svn179-ffmpeg-2.4.3-compatibility.patch | 22 -
dvbcut-svn179-ffmpeg-3.0.3-compatibility.patch | 1100 ------------------------
11 files changed, 1587 deletions(-)
2 years, 4 months
[xpra-codecs-freeworld] Release 4.3
by sagitter
commit 6dbe7516c2754808a93b0d3b939645ed4dfbfd93
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Sat Dec 18 11:44:07 2021 +0100
Release 4.3
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 8 ++++++--
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 15b38bd..64b8c37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@ xpra-0.16.3.tar.xz
/xpra-4.2.1.tar.gz
/xpra-4.2.2.tar.gz
/xpra-4.2.3.tar.gz
+/xpra-4.3.tar.gz
diff --git a/sources b/sources
index 358a509..b832420 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xpra-4.2.3.tar.gz) = 9e0d3a2765a9c9465ecf9606f50ef74a9da2e41469a62118db1c59f3ed109cb5005763789275ada56f8b367473b72546dffb29150b9d6c2fd16a9fc567c1ab33
+SHA512 (xpra-4.3.tar.gz) = 94a4e9c6d2a4b1c56cb2ebf0588e9f4d1e5a1a2ad290c132e24c45d9391a76947676c0afef8e261fb092b74903b5bc29bc7b589430fb202e21c12796fae485a6
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index ef2b05e..0cf2b35 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -30,8 +30,8 @@
%endif
Name: xpra-codecs-freeworld
-Version: 4.2.3
-Release: 2%{?dist}
+Version: 4.3
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
URL: http://www.xpra.org/
@@ -43,6 +43,7 @@ BuildRequires: python3-cairo-devel
BuildRequires: pygtk2-devel
BuildRequires: gtk3-devel
BuildRequires: libXtst-devel
+BuildRequires: libXres-devel
BuildRequires: libxkbfile-devel, libvpx-devel
BuildRequires: xvidcore-devel, x265-devel
BuildRequires: python3-Cython, ack
@@ -132,6 +133,9 @@ find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Fri Dec 17 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 4.3.0-1
+- Release 4.3
+
* Fri Nov 12 2021 Leigh Scott <leigh123linux(a)gmail.com> - 4.2.3-2
- Rebuilt for new ffmpeg snapshot
2 years, 4 months
[xine-ui] Fix build with libcaca >= 0.99.beta20
by Xavier Bachelot
commit a058b40765c0cb332736b95f0f5096db23919467
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Dec 17 19:45:11 2021 +0100
Fix build with libcaca >= 0.99.beta20
xine-ui-0.9.13-libcaca_beta20.patch | 40 +++++++++++++++++++++++++++++++++++++
xine-ui.spec | 4 ++++
2 files changed, 44 insertions(+)
---
diff --git a/xine-ui-0.9.13-libcaca_beta20.patch b/xine-ui-0.9.13-libcaca_beta20.patch
new file mode 100644
index 0000000..ae74a42
--- /dev/null
+++ b/xine-ui-0.9.13-libcaca_beta20.patch
@@ -0,0 +1,40 @@
+Fix build with libcaca >= 0.99.beta20.
+--- src/aaui/main.c.orig 2021-12-12 13:49:29.000000000 -0600
++++ src/aaui/main.c 2021-12-17 00:36:53.000000000 -0600
+@@ -69,6 +69,9 @@
+ # include <caca.h>
+ # ifdef CUCUL
+ # include <cucul.h>
++# define caca_canvas_t cucul_canvas_t
++# define caca_create_canvas cucul_create_canvas
++# define caca_free_canvas cucul_free_canvas
+ # endif
+ #endif
+
+@@ -93,7 +96,7 @@
+ aa_context *context;
+ #endif
+ #ifdef CACA
+- cucul_canvas_t *canvas;
++ caca_canvas_t *canvas;
+ caca_display_t *display;
+ #endif
+ char *mrl[1024];
+@@ -828,7 +831,7 @@
+ if(!video_driver_id)
+ video_driver_id = "caca";
+
+- aaxine.canvas = cucul_create_canvas(0, 0);
++ aaxine.canvas = caca_create_canvas(0, 0);
+ aaxine.display = caca_create_display(aaxine.canvas);
+ aaxine.vo_port = xine_open_video_driver(__xineui_global_xine_instance,
+ video_driver_id,
+@@ -1145,7 +1148,7 @@
+ #ifdef CACA
+ if(aaxine.display) {
+ caca_free_display(aaxine.display);
+- cucul_free_canvas(aaxine.canvas);
++ caca_free_canvas(aaxine.canvas);
+ }
+ #endif
+
diff --git a/xine-ui.spec b/xine-ui.spec
index f68d909..6980a1a 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -62,6 +62,8 @@ Patch1: xine-ui-0.99.13-utf8doc.patch
# Fix build on armv7hl, ppc64le and aarch64
# https://sourceforge.net/p/xine/xine-ui/ci/f9a98e02460348ca23ca2f5c2b39e62...
Patch100: xine-ui-0.9.13-Fix_build.patch
+# https://raw.githubusercontent.com/macports/macports-ports/f925ff1a4f8d59a...
+Patch101: xine-ui-0.9.13-libcaca_beta20.patch
BuildRequires: aalib-devel >= 1.2.0
BuildRequires: autoconf
@@ -132,6 +134,7 @@ It also contains the color ascii art and framebuffer versions.
%patch1 -p1
%patch100 -p1
+%patch101 -p0
# By default aaxine dlopen()'s a nonversioned libX11.so, however in Fedora
# it's provided by libX11-devel => version the dlopen()
@@ -265,6 +268,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Fri Dec 17 2021 Xavier Bachelot <xavier(a)bachelot.org> - 0.99.13-2
- Fix build on armv7hl, ppc64le and aarch64
+- Fix build with libcaca >= 0.99.beta20
* Mon Dec 13 2021 Xavier Bachelot <xavier(a)bachelot.org> - 0.99.13-1
- Update to 0.99.13
2 years, 4 months
[xine-ui] Fix build on armv7hl, ppc64le and aarch64
by Xavier Bachelot
commit 32641c51ba59cb5751010a9c2f245f6ad3aedd45
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Fri Dec 17 19:44:27 2021 +0100
Fix build on armv7hl, ppc64le and aarch64
xine-ui-0.9.13-Fix_build.patch | 49 ++++++++++++++++++++++++++++++++++++++++++
xine-ui.spec | 10 ++++++++-
2 files changed, 58 insertions(+), 1 deletion(-)
---
diff --git a/xine-ui-0.9.13-Fix_build.patch b/xine-ui-0.9.13-Fix_build.patch
new file mode 100644
index 0000000..1003f23
--- /dev/null
+++ b/xine-ui-0.9.13-Fix_build.patch
@@ -0,0 +1,49 @@
+# HG changeset patch
+# User Torsten Jager <t.jager(a)gmx.de>
+# Date 1639694590 -3600
+# Thu Dec 16 23:43:10 2021 +0100
+# Node ID f9a98e02460348ca23ca2f5c2b39e62c8758b22d
+# Parent e352b6eef94b6441f4afc86f96abe247acc2a60b
+Fix build.
+
+diff -r e352b6eef94b -r f9a98e024603 configure.ac
+--- a/configure.ac Sat Dec 11 19:53:57 2021 +0200
++++ b/configure.ac Thu Dec 16 23:43:10 2021 +0100
+@@ -600,8 +600,10 @@
+ ])], [have_attr_iaso=yes], [have_attr_iaso=no])
+ AC_MSG_RESULT([$have_attr_iaso])
+ if test x"$have_attr_iaso" = x"yes" ; then
+- AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS],
+- [__attribute__ ((__target__ ("inline-all-stringops")))],
++ AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS], [__attribute__ ((__target__ ("inline-all-stringops")))],
++ [Define this to a function attribute that inlines string handling code])
++else
++ AC_DEFINE([ATTR_INLINE_ALL_STRINGOPS], [],
+ [Define this to a function attribute that inlines string handling code])
+ fi
+
+diff -r e352b6eef94b -r f9a98e024603 src/common/utils.h
+--- a/src/common/utils.h Sat Dec 11 19:53:57 2021 +0200
++++ b/src/common/utils.h Thu Dec 16 23:43:10 2021 +0100
+@@ -21,7 +21,7 @@
+ #ifndef _COMMON_UTILS_H
+ #define _COMMON_UTILS_H
+
+-#ifndef HAVE_CONFIG_H
++#ifndef PACKAGE_NAME
+ #error config.h not included
+ #endif
+
+diff -r e352b6eef94b -r f9a98e024603 src/xitk/network.c
+--- a/src/xitk/network.c Sat Dec 11 19:53:57 2021 +0200
++++ b/src/xitk/network.c Thu Dec 16 23:43:10 2021 +0100
+@@ -34,7 +34,9 @@
+
+ //#warning IMPLEMENT POST SUPPORT
+
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+
+ #ifdef HAVE_READLINE
+
diff --git a/xine-ui.spec b/xine-ui.spec
index 08dd29a..f68d909 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -10,7 +10,7 @@
Name: xine-ui
Version: 0.99.13
-Release: 1%{?snapshot:.%{date}hg%{commit}}%{?dist}
+Release: 2%{?snapshot:.%{date}hg%{commit}}%{?dist}
Summary: A skinned xlib-based gui for xine-lib
License: GPLv2+
URL: http://www.xine-project.org/
@@ -59,6 +59,10 @@ Source100: make_xineui_snapshot.sh
# Patch to use UTF-8 documentation, BZ #512598
Patch1: xine-ui-0.99.13-utf8doc.patch
+# Fix build on armv7hl, ppc64le and aarch64
+# https://sourceforge.net/p/xine/xine-ui/ci/f9a98e02460348ca23ca2f5c2b39e62...
+Patch100: xine-ui-0.9.13-Fix_build.patch
+
BuildRequires: aalib-devel >= 1.2.0
BuildRequires: autoconf
BuildRequires: automake
@@ -127,6 +131,7 @@ It also contains the color ascii art and framebuffer versions.
%setup -T -D -n %{name}-%{version}%{?snapshot:hg}
%patch1 -p1
+%patch100 -p1
# By default aaxine dlopen()'s a nonversioned libX11.so, however in Fedora
# it's provided by libX11-devel => version the dlopen()
@@ -258,6 +263,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Dec 17 2021 Xavier Bachelot <xavier(a)bachelot.org> - 0.99.13-2
+- Fix build on armv7hl, ppc64le and aarch64
+
* Mon Dec 13 2021 Xavier Bachelot <xavier(a)bachelot.org> - 0.99.13-1
- Update to 0.99.13
2 years, 4 months
[plex-media-player] Use bundled desktop file (rfbz#6180)
by Leigh Scott
commit 7f0e282cba77443e81f9aed1e60e4ef81a867823
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Dec 17 09:16:35 2021 +0000
Use bundled desktop file (rfbz#6180)
plex-media-player.spec | 10 +++++-----
plexmediaplayer.desktop | 9 ---------
2 files changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/plex-media-player.spec b/plex-media-player.spec
index cb628b9..8140b7c 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -10,13 +10,12 @@
Name: plex-media-player
Version: 2.58.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Plex Media Player
License: GPLv2+
URL: https://plex.tv/
Source0: %{git_url}/archive/v%{plex_hash}/%{name}-%{plex_hash}.tar.gz
-Source1: plexmediaplayer.desktop
Source2: plexmediaplayer.appdata.xml
Source3: plexmediaplayer.service
Source4: plexmediaplayer.target
@@ -144,9 +143,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/polkit-1/localauthority/50-local.d
install -pm0644 %{SOURCE5} \
%{buildroot}%{_sysconfdir}/polkit-1/localauthority/50-local.d/plexmediaplayer.pkla.disabled
-desktop-file-install \
- --dir=%{buildroot}%{_datadir}/applications \
- %{SOURCE1}
+desktop-file-validate %{buildroot}%{_datadir}/applications/plexmediaplayer.desktop
mkdir -p %{buildroot}%{_sharedstatedir}/plex-media-player
@@ -210,6 +207,9 @@ exit 0
%{_unitdir}/%{name}.target
%changelog
+* Fri Dec 17 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.1-3
+- Use bundled desktop file (rfbz#6180)
+
* Tue Aug 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.58.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
2 years, 4 months
