[x264] Fix "assignment from incompatible pointer type" errors on ppc64le
by Dominik Mierzejewski
commit d2bbc0d0cc510b95b7c7348c6345b6c81146965e
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Sun Mar 10 22:59:12 2024 +0100
Fix "assignment from incompatible pointer type" errors on ppc64le
- Use correct build dependency on bash-completion
x264-altivec-incompatible-pointer-type.patch | 21 +++++++++++++++++++++
x264.spec | 11 +++++++++--
2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/x264-altivec-incompatible-pointer-type.patch b/x264-altivec-incompatible-pointer-type.patch
new file mode 100644
index 0000000..949e2aa
--- /dev/null
+++ b/x264-altivec-incompatible-pointer-type.patch
@@ -0,0 +1,21 @@
+diff -up generic/common/ppc/pixel.c.orig generic/common/ppc/pixel.c
+--- generic/common/ppc/pixel.c.orig 2023-10-01 16:28:26.000000000 +0200
++++ generic/common/ppc/pixel.c 2024-03-10 22:23:23.415298686 +0100
+@@ -855,7 +855,7 @@ static void pixel_sad_x4_16x8_altivec( u
+ sum2v = (vec_s32_t) vec_sum4s( vec_absd( fencv, pix2v ), (vec_u32_t) sum2v );
+
+ #define PIXEL_SAD_X3_ALTIVEC( name, ly ) \
+-static int name( uint8_t *fenc, uint8_t *pix0, \
++static void name( uint8_t *fenc, uint8_t *pix0, \
+ uint8_t *pix1, uint8_t *pix2, \
+ intptr_t i_stride, int scores[3] ) \
+ { \
+@@ -965,7 +965,7 @@ static void pixel_sad_x3_16x8_altivec( u
+ }
+
+ #define PIXEL_SAD_X4_ALTIVEC( name, ly ) \
+-static int name( uint8_t *fenc, \
++static void name( uint8_t *fenc, \
+ uint8_t *pix0, uint8_t *pix1, \
+ uint8_t *pix2, uint8_t *pix3, \
+ intptr_t i_stride, int scores[4] ) \
diff --git a/x264.spec b/x264.spec
index 3bd901a..0b8c2d9 100644
--- a/x264.spec
+++ b/x264.spec
@@ -33,7 +33,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 12%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 13%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -44,6 +44,8 @@ Source2: version.h
Patch0: x264-nover.patch
# add 10b suffix to high bit depth build
Patch1: x264-10b.patch
+# fix assignment from incompatible pointer type errors
+Patch2: x264-altivec-incompatible-pointer-type.patch
Patch11: x264-opencl.patch
BuildRequires: gcc
@@ -57,7 +59,7 @@ BuildRequires: execstack
%ifarch %{asmarch}
BuildRequires: nasm
%endif
-BuildRequires: bash-completion
+BuildRequires: pkgconfig(bash-completion)
# we need to enforce the exact EVR for an ISA - not only the same ABI
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: ffmpeg-libs%{?_isa}
@@ -109,6 +111,7 @@ pushd %{name}-0.%{api}-%{snapshot}
cp %{SOURCE2} .
%patch -P0 -p1 -b .nover
%patch -P1 -p1 -b .10b
+%patch -P2 -p1 -b .ptr
%patch -P11 -p1 -b .opencl
popd
@@ -182,6 +185,10 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Sun Mar 10 2024 Dominik Mierzejewski <dominik(a)greysector.net> - 0.164-13.20231001git31e19f92
+- Fix "assignment from incompatible pointer type" errors on ppc64le
+- Use correct build dependency on bash-completion
+
* Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.164-12.20231001git31e19f92
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
8 months, 2 weeks
[girl] Add missing BR packages
by sagitter
Summary of changes:
596e79b... Add missing BR packages (*)
(*) This commit already existed in another branch; no separate mail sent
8 months, 2 weeks
[girl/f40] Add missing BR packages
by sagitter
commit 596e79b3e435f836dc8ee2a0e6e49973c9cc7bed
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Sun Mar 10 17:35:43 2024 +0100
Add missing BR packages
girl.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/girl.spec b/girl.spec
index 0d58ac5..17ba489 100644
--- a/girl.spec
+++ b/girl.spec
@@ -20,6 +20,9 @@ BuildRequires: libxml2-devel
BuildRequires: gnome-vfs2-devel
BuildRequires: libgnomeui-devel
BuildRequires: gcc
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
BuildRequires: intltool
BuildRequires: itstool
BuildRequires: libappstream-glib
8 months, 2 weeks
[girl/f40] Release 12.0.1
by sagitter
Summary of changes:
4295502... Release 12.0.1 (*)
(*) This commit already existed in another branch; no separate mail sent
8 months, 2 weeks
[girl] Release 12.0.1
by sagitter
commit 4295502840ad79532127df14b860aa2e79c6ec10
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Sun Mar 10 17:09:48 2024 +0100
Release 12.0.1
.gitignore | 1 +
girl-gcc14.patch | 16 ++++++++++++++
girl.spec | 63 +++++++++++++++++++++++++++++++++++---------------------
sources | 2 +-
4 files changed, 58 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 82bc705..98b95cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/girl-9.7.0.tar.xz
/girl-9.9.1.tar.xz
/girl-10.0.0.tar.xz
+/gnome-internet-radio-locator-12.0.1.tar.gz
diff --git a/girl-gcc14.patch b/girl-gcc14.patch
new file mode 100644
index 0000000..74bbd9b
--- /dev/null
+++ b/girl-gcc14.patch
@@ -0,0 +1,16 @@
+--- a/src/gnome-internet-radio-locator-location.orig.c 2021-07-22 21:22:28.000000000 +0200
++++ b/src/gnome-internet-radio-locator-location.c 2024-03-10 16:15:13.254297263 +0100
+@@ -19,6 +19,13 @@
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
++
++#if defined __GNUC__ && __GNUC__ >= 14
++#pragma GCC diagnostic warning "-Wimplicit-function-declaration"
++#pragma GCC diagnostic warning "-Wincompatible-pointer-types"
++#pragma GCC diagnostic warning "-Wint-conversion"
++#pragma GCC diagnostic warning "-Wreturn-mismatch"
++#endif
+
+ #include <config.h>
+ #include <gtk/gtk.h>
diff --git a/girl.spec b/girl.spec
index a40e42e..0d58ac5 100644
--- a/girl.spec
+++ b/girl.spec
@@ -1,12 +1,18 @@
-%define _legacy_common_support 1
-
Name: girl
-Version: 10.0.0
-Release: 16%{?dist}
+Version: 12.0.1
+Release: 1%{?dist}
Summary: GNOME Internet Radio Locator program
-License: GPLv2+
-URL: http://people.gnome.org/~ole/girl
-Source: http://people.gnome.org/~ole/%{name}/%{name}-%{version}.tar.xz
+
+# src/gnome-internet-radio-locator-markers.c: GNU General Public License v3.0 or later and/or GNU Lesser General Public License v2.1 or later
+# src/gnome-internet-radio-locator-markers.h: GNU General Public License v3.0 or later and/or GNU Lesser General Public License v2.1 or later
+License: GPL-2.0-or-later AND GPL-3.0-or-later AND (GPL-3.0-or-later OR LGPL-2.1-or-later)
+URL: https://github.com/GNOME/gnome-internet-radio-locator
+Source0: https://github.com/GNOME/gnome-internet-radio-locator/archive/refs/tags/%...
+
+# These aren't real fixes (waiting upstream for this)
+# Just a way to accommodate C code generators.
+# See https://gcc.gnu.org/gcc-14/porting_to.html
+Patch0: %{name}-gcc14.patch
BuildRequires: gtk2-devel
BuildRequires: libgnome-devel
@@ -21,9 +27,13 @@ BuildRequires: desktop-file-utils
BuildRequires: gstreamer1-devel
BuildRequires: gstreamer1-plugins-base-devel
BuildRequires: gstreamer1-plugins-bad-free-devel
-Requires: gstreamer1 >= 1.8.3
-Requires: gstreamer1-plugins-ugly >= 1.8.3
-Requires: streamripper >= 1.64.6
+BuildRequires: pkgconfig(champlain-gtk-0.12)
+BuildRequires: pkgconfig(geocode-glib-2.0)
+BuildRequires: pkgconfig(geoclue-2.0)
+BuildRequires: pkgconfig(libgeoclue-2.0)
+Requires: gstreamer1%{?_isa} >= 1.8.3
+Requires: gstreamer1-plugins-ugly%{?_isa} >= 1.8.3
+Requires: streamripper%{?_isa} >= 1.64.6
%description
GIRL is a GNOME Internet Radio Locator program that allows the user
@@ -37,7 +47,11 @@ streamripper for recording.
Enjoy Internet Radio.
%prep
-%setup -q
+%autosetup -n gnome-internet-radio-locator-%{version} -p1
+
+# In Fedora, "geocode-glib > 3.20" has an api version 2.0
+sed -e 's|geocode-glib-1.0|geocode-glib-2.0|' -i configure.ac
+autoreconf -ivf
%build
%configure --with-recording --disable-silent-rules
@@ -45,24 +59,27 @@ Enjoy Internet Radio.
%install
%make_install
-%find_lang %{name} --with-man
+%find_lang gnome-internet-radio-locator
+%find_lang gnome-internet-radio-locator --with-man
%check
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/gnome-internet-radio-locator.appdata.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/gnome-internet-radio-locator.desktop
-%files -f %{name}.lang
-%doc AUTHORS LETTER NEWS README TODO VERSION YP-DIRS ChangeLog
+%files -f gnome-internet-radio-locator.lang
+%doc AUTHORS GEOLOCATION BROADCAST NEWS README
%license COPYING
-%{_bindir}/%{name}
-%{_datadir}/%{name}/
-%{_datadir}/appdata/%{name}.appdata.xml
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/*/apps/%{name}.png
-%{_mandir}/man1/%{name}.1*
-%{_datadir}/help/*/%{name}/
+%{_bindir}/gnome-internet-radio-locator
+%{_datadir}/gnome-internet-radio-locator/
+%{_metainfodir}/gnome-internet-radio-locator.appdata.xml
+%{_datadir}/applications/gnome-internet-radio-locator.desktop
+%{_datadir}/icons/hicolor/*/apps/gnome-internet-radio-locator.png
+%{_mandir}/man1/gnome-internet-radio-locator.1*
%changelog
+* Sun Mar 10 2024 Antonio Trande <sagitter(a)fedoraproject.org> - 12.0.1-1
+- Release 12.0.1
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 10.0.0-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources
index 8b735c3..f7de017 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9f6fabaf99b0a0e5d5c2c8fac4d4d001 girl-10.0.0.tar.xz
+SHA512 (gnome-internet-radio-locator-12.0.1.tar.gz) = 29259b9f351d3e506f7fa7a8448e3fbda5712ead6d5491d10b8ddb71b9b71ba6c53c452e354dec5d338109bb8f952252edecab3b73b641d999042c34b834724b
8 months, 2 weeks
[vdr-markad/f38] Update to 3.4.11
by Martin Gansser
Summary of changes:
5c0fda3... Update to 3.4.11 (*)
(*) This commit already existed in another branch; no separate mail sent
8 months, 2 weeks
[vdr-markad/f39] Update to 3.4.11
by Martin Gansser
Summary of changes:
5c0fda3... Update to 3.4.11 (*)
(*) This commit already existed in another branch; no separate mail sent
8 months, 2 weeks
[vdr-markad] Update to 3.4.11
by Martin Gansser
commit 5c0fda330838ce7f5648f4ed6d0cb6337423fc3d
Author: Martin Gansser <mgansser(a)online.de>
Date: Sun Mar 10 14:40:08 2024 +0100
Update to 3.4.11
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b0d3a4f..b269f99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,3 +82,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-3.4.8.tar.gz
/vdr-markad-3.4.9.tar.gz
/vdr-markad-3.4.10.tar.gz
+/vdr-markad-3.4.11.tar.gz
diff --git a/sources b/sources
index a3ea2ad..784e204 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-3.4.10.tar.gz) = d5ceb45db6d2120d25ee45190547bcb48a3cbfd7b21c915d1fdf975358a04a66e904af368c8d2584e80449e05e1ebbcce8e0ccdf0b701ce975608738eebffb51
+SHA512 (vdr-markad-3.4.11.tar.gz) = b225e119adb39761572e6f77f219a48d9e1aef8f39e347733808ec810923b8fc38cb73ebbb8e6b132e6d460fce5cf6d39633602ca9dd6170e01457f98b00616b
diff --git a/vdr-markad.spec b/vdr-markad.spec
index b7def6b..0d87449 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -5,7 +5,7 @@
%endif
Name: vdr-markad
-Version: 3.4.10
+Version: 3.4.11
Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
@@ -72,6 +72,9 @@ fi
%doc html
%changelog
+* Sun Mar 10 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 3.4.11-1
+- Update to 3.4.11
+
* Sat Mar 09 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 3.4.10-1
- Update to 3.4.10
8 months, 2 weeks