From cd392d9b209615deaf12dbe420d30236337e8f08 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Jun 2024 04:21:36 +0000 Subject: [PATCH 01/14] bump: envision --- anda/apps/envision/envision.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/envision/envision.spec b/anda/apps/envision/envision.spec index 9abe6cb9b2..4c25cad234 100644 --- a/anda/apps/envision/envision.spec +++ b/anda/apps/envision/envision.spec @@ -1,5 +1,5 @@ -%global commit 495ffef93bc987d96aa5acb2920c5d581ca99ea9 -%global commit_date 20240624 +%global commit b594f75778961c281daca398011914e9ac14b753 +%global commit_date 20240625 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: envision From 4b0b1d41261e236d265f5f3f846b8096e9f9502a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Jun 2024 06:20:58 +0000 Subject: [PATCH 02/14] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index fef3505d4b..e144bd19df 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -3,7 +3,7 @@ %define __strip /bin/true Name: osu-lazer -Version: 2024.521.2 +Version: 2024.625.0 Release: 1%?dist Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From 7074e100a997dfb5aa81d95f32f49700e9b07ec6 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Jun 2024 12:35:47 +0000 Subject: [PATCH 03/14] bump: tau-helium --- anda/themes/tau-helium/tau-helium.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/themes/tau-helium/tau-helium.spec b/anda/themes/tau-helium/tau-helium.spec index 9c34bb8c5c..f237677c40 100644 --- a/anda/themes/tau-helium/tau-helium.spec +++ b/anda/themes/tau-helium/tau-helium.spec @@ -1,4 +1,4 @@ -%global ver 1.8.10-9 +%global ver 1.8.10-10 Summary: tauOS GTK/GNOME Shell Themes Name: tau-helium From 1c7247904d8bd02df461c29f25e68fe930438224 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Jun 2024 15:49:41 +0000 Subject: [PATCH 04/14] bump: discord-openasar discord --- anda/apps/discord-openasar/discord-openasar.spec | 2 +- anda/apps/discord/discord.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-openasar/discord-openasar.spec b/anda/apps/discord-openasar/discord-openasar.spec index 4424e2ed92..75bb5c5301 100644 --- a/anda/apps/discord-openasar/discord-openasar.spec +++ b/anda/apps/discord-openasar/discord-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-openasar -Version: 0.0.57 +Version: 0.0.58 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord/discord.spec b/anda/apps/discord/discord.spec index 6921ce8be0..7d402e9983 100644 --- a/anda/apps/discord/discord.spec +++ b/anda/apps/discord/discord.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord -Version: 0.0.57 +Version: 0.0.58 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: https://discord.com From f75d51ebdddbdc81f283de57d37b158a20753fda Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Jun 2024 16:41:19 +0000 Subject: [PATCH 05/14] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index e144bd19df..36b34cb86b 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -3,7 +3,7 @@ %define __strip /bin/true Name: osu-lazer -Version: 2024.625.0 +Version: 2024.625.2 Release: 1%?dist Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From 9ac6398151bb234ebcddc954af25c62da4145003 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Jun 2024 16:55:49 +0000 Subject: [PATCH 06/14] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 9861c3faa8..62330543de 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.433 +Version: 0.0.434 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 8cc1aae79d..9accd5657c 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.433 +Version: 0.0.434 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 24a20947b9c302c16fab703233d9b5c6c56cbd0a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Jun 2024 18:00:03 +0000 Subject: [PATCH 07/14] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 62330543de..bba2afc428 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.434 +Version: 0.0.435 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index 9accd5657c..a0acdd83a2 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.434 +Version: 0.0.435 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 8a5255d26903f09bc00a9b0a9df35b112f861363 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Jun 2024 20:16:51 +0000 Subject: [PATCH 08/14] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index bba2afc428..ad67ce2744 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.435 +Version: 0.0.436 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index a0acdd83a2..cbed4ab845 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.435 +Version: 0.0.436 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From 1f223402bdfaf399e7d6bf3349808a3445985b8a Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 25 Jun 2024 22:13:29 +0000 Subject: [PATCH 09/14] bump: discord-canary-openasar discord-canary electron --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- anda/tools/electron/electron.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index ad67ce2744..24fa970523 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.436 +Version: 0.0.437 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index cbed4ab845..e68cc7c52c 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.436 +Version: 0.0.437 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com diff --git a/anda/tools/electron/electron.spec b/anda/tools/electron/electron.spec index 7a1f4acca1..4e0b1a2011 100644 --- a/anda/tools/electron/electron.spec +++ b/anda/tools/electron/electron.spec @@ -12,7 +12,7 @@ %global __provides_exclude_from %{_libdir}/%{name}/.*\\.so Name: electron -Version: 31.0.2 +Version: 31.1.0 Release: 1%?dist Summary: Build cross platform desktop apps with web technologies License: MIT From f8e910e91d7c0a9f3491f852e6805fbf87a73df8 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Jun 2024 00:27:41 +0000 Subject: [PATCH 10/14] bump: nushell --- anda/langs/rust/nushell/nushell.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/langs/rust/nushell/nushell.spec b/anda/langs/rust/nushell/nushell.spec index 7139563589..f856f441ba 100644 --- a/anda/langs/rust/nushell/nushell.spec +++ b/anda/langs/rust/nushell/nushell.spec @@ -1,5 +1,5 @@ Name: nushell -Version: 0.94.2 +Version: 0.95.0 Release: 1%?dist Summary: A new type of shell License: MIT From c6c8214baaa480096186a6b7bacc4839624f4e6d Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 26 Jun 2024 04:39:52 -0700 Subject: [PATCH 11/14] fix: openh264 (#1385) (#1392) Follow upstream: https://src.fedoraproject.org/rpms/openh264/c/67d9f02?branch=rawhide (cherry picked from commit 62c6782160e05826a3fe15545de0fbafd49e367f) Co-authored-by: madomado --- anda/lib/openh264/anda.hcl | 2 +- anda/lib/openh264/gst-p-bad-cleanup.sh | 201 ------------------ anda/lib/openh264/hardcode-openh264-dep.patch | 14 -- anda/lib/openh264/openh264.spec | 113 +--------- anda/lib/openh264/pre.rhai | 14 -- anda/lib/openh264/update.rhai | 4 +- 6 files changed, 9 insertions(+), 339 deletions(-) delete mode 100644 anda/lib/openh264/gst-p-bad-cleanup.sh delete mode 100644 anda/lib/openh264/hardcode-openh264-dep.patch delete mode 100644 anda/lib/openh264/pre.rhai diff --git a/anda/lib/openh264/anda.hcl b/anda/lib/openh264/anda.hcl index e652be253d..b62df13d06 100644 --- a/anda/lib/openh264/anda.hcl +++ b/anda/lib/openh264/anda.hcl @@ -1,5 +1,5 @@ project pkg { rpm { - spec = "openh264.spec" + spec = "openh264.spec" } } diff --git a/anda/lib/openh264/gst-p-bad-cleanup.sh b/anda/lib/openh264/gst-p-bad-cleanup.sh deleted file mode 100644 index 92211717e0..0000000000 --- a/anda/lib/openh264/gst-p-bad-cleanup.sh +++ /dev/null @@ -1,201 +0,0 @@ -#!/bin/sh - -# Process a gst-plugins-bad tarball to remove -# unwanted GStreamer plugins. -# -# This script here is taken from Fedora gstreamer1-plugins-bad-free repo, with -# only change being openh264 addition. -# -# See https://bugzilla.redhat.com/show_bug.cgi?id=532470 -# for details -# -# Bastien Nocera - 2010 -# - -SOURCE="$1" -NEW_SOURCE=`echo $SOURCE | sed 's/bad-/bad-openh264-/'` -DIRECTORY=`echo $SOURCE | sed 's/\.tar\.xz//'` - -ALLOWED=" -aacparse -accurip -adpcmdec -adpcmenc -aiff -aiffparse -amrparse -asfmux -audiobuffersplit -audiofxbad -audiolatency -audiomixer -audiomixmatrix -audioparsers -audiovisualizers -autoconvert -bayer -camerabin -camerabin2 -cdxaparse -codecalpha -codectimestamper -coloreffects -colorspace -compositor -dataurisrc -dccp -debugutils -dtmf -dvbsubenc -faceoverlay -festival -fieldanalysis -freeverb -freeze -frei0r -gaudieffects -gdp -geometrictransform -h264parse -hdvparse -hls -id3tag -inter -interlace -invtelecine -ivfparse -ivtc -jpegformat -jp2kdecimator -legacyresample -librfb -liveadder -midi -mve -mpegdemux -mpeg4videoparse -mpegpsmux -mpegtsdemux -mpegtsmux -mpegvideoparse -mxf -netsim -nsf -nuvdemux -onvif -openh264 -patchdetect -pcapparse -pnm -proxy -qtmux -rawparse -removesilence -rist -rtmp2 -rtp -rtpmux -rtpvp8 -scaletempo -sdi -sdp -segmentclip -selector -smooth -speed -stereo -subenc -switchbin -timecode -transcode -tta -valve -videofilters -videoframe_audiolevel -videomaxrate -videomeasure -videoparsers -videosignal -vmnc -yadif -y4m -" - -NOT_ALLOWED=" -dvbsuboverlay -dvdspu -real -siren -" - -error() -{ - MESSAGE=$1 - echo $MESSAGE - exit 1 -} - -check_allowed() -{ - MODULE=$1 - for i in $ALLOWED ; do - if test x$MODULE = x$i ; then - return 0; - fi - done - # Ignore errors coming from ext/ directory - # they require external libraries so are ineffective anyway - return 1; -} - -check_not_allowed() -{ - MODULE=$1 - for i in $NOT_ALLOWED ; do - if test x$MODULE = x$i ; then - return 0; - fi - done - return 1; -} - -rm -rf $DIRECTORY -tar xJf $SOURCE || error "Cannot unpack $SOURCE" -pushd $DIRECTORY > /dev/null || error "Cannot open directory \"$DIRECTORY\"" - -unknown="" -for subdir in gst ext sys; do - for dir in $subdir/* ; do - # Don't touch non-directories - if ! [ -d $dir ] ; then - continue; - fi - MODULE=`basename $dir` - if ( check_not_allowed $MODULE ) ; then - echo "**** Removing $MODULE ****" - echo "Removing directory $dir" - rm -r $dir || error "Cannot remove $dir" - echo - elif test $subdir = ext || test $subdir = sys; then - # Ignore library or system non-blacklisted plugins - continue; - elif ! ( check_allowed $MODULE ) ; then - echo "Unknown module in $dir" - unknown="$unknown $dir" - fi - done -done - -echo - -if test "x$unknown" != "x"; then - echo -n "Aborting due to unkown modules: " - echo "$unknown" | sed "s/ /\n /g" - exit 1 -fi - -popd > /dev/null - -tar cJf $NEW_SOURCE $DIRECTORY -echo "$NEW_SOURCE is ready to use" - diff --git a/anda/lib/openh264/hardcode-openh264-dep.patch b/anda/lib/openh264/hardcode-openh264-dep.patch deleted file mode 100644 index fbedcd96e1..0000000000 --- a/anda/lib/openh264/hardcode-openh264-dep.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up gst-plugins-bad-1.18.2/ext/openh264/meson.build.orig gst-plugins-bad-1.18.2/ext/openh264/meson.build ---- gst-plugins-bad-1.18.2/ext/openh264/meson.build.orig 2020-12-06 14:24:13.000000000 +0100 -+++ gst-plugins-bad-1.18.2/ext/openh264/meson.build 2021-02-11 11:48:58.660450319 +0100 -@@ -4,9 +4,7 @@ openh264_sources = [ - 'gstopenh264plugin.c', - ] - --openh264_dep = dependency('openh264', version : '>= 1.3.0', -- required : get_option('openh264'), -- fallback: ['openh264', 'openh264_dep']) -+openh264_dep = cc.find_library('openh264') - - if openh264_dep.found() - gstopenh264 = library('gstopenh264', diff --git a/anda/lib/openh264/openh264.spec b/anda/lib/openh264/openh264.spec index 55ba818ffe..27e0bb42c8 100644 --- a/anda/lib/openh264/openh264.spec +++ b/anda/lib/openh264/openh264.spec @@ -2,31 +2,20 @@ %global commit1 e7d30b921df736a1121a0c8e0cf3ab1ce5b8a4b7 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7}) -%global openh264_version 2.4.1 -%global gst_version 1.24.5 - Name: openh264 -Version: %{openh264_version} +Version: 2.4.1 # Also bump the Release tag for gstreamer1-plugin-openh264 down below Release: 1%{?dist} Summary: H.264 codec library License: BSD URL: https://www.openh264.org/ -Source0: https://github.com/cisco/openh264/archive/v%{openh264_version}/openh264-%{openh264_version}.tar.gz +Source0: https://github.com/cisco/openh264/archive/v%version/openh264-%version.tar.gz Source1: https://github.com/mozilla/gmp-api/archive/%{commit1}/gmp-api-%{shortcommit1}.tar.gz -# The source is: -# http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%%{gst_version}.tar.xz -# modified with gst-p-bad-cleanup.sh from SOURCE3 -Source2: gst-plugins-bad-openh264-%{gst_version}.tar.xz -Source3: gst-p-bad-cleanup.sh - -# Don't use pkg-config for finding openh264 as we are building against an in-tree copy -Patch2: hardcode-openh264-dep.patch BuildRequires: gcc-c++ -BuildRequires: gstreamer1-devel >= %{gst_version} -BuildRequires: gstreamer1-plugins-base-devel >= %{gst_version} +BuildRequires: gstreamer1-devel +BuildRequires: gstreamer1-plugins-base-devel BuildRequires: make BuildRequires: meson BuildRequires: nasm @@ -38,7 +27,7 @@ suitable for use in real time applications such as WebRTC. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{openh264_version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -47,7 +36,7 @@ developing applications that use %{name}. %package -n mozilla-openh264 Summary: H.264 codec support for Mozilla browsers -Requires: %{name}%{?_isa} = %{openh264_version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: mozilla-filesystem%{?_isa} %description -n mozilla-openh264 @@ -55,18 +44,6 @@ The mozilla-openh264 package contains a H.264 codec plugin for Mozilla browsers. -%package -n gstreamer1-plugin-openh264 -Version: %{gst_version} -Release: 2%{?dist} -Summary: GStreamer H.264 plugin - -%description -n gstreamer1-plugin-openh264 -GStreamer is a streaming media framework, based on graphs of elements which -operate on media data. - -This package contains the H.264 plugin. - - %prep %setup -q @@ -74,12 +51,6 @@ This package contains the H.264 plugin. tar -xf %{S:1} mv gmp-api-%{commit1} gmp-api -# Extract gst-plugins-bad-free archive -tar -xf %{S:2} -pushd gst-plugins-bad-%{gst_version} -%patch2 -p1 -popd - %build # Update the makefile with our build options @@ -96,20 +67,6 @@ make %{?_smp_mflags} # ... then build the mozilla plugin make plugin %{?_smp_mflags} -# ... and finally build the gstreamer plugin against the previously built -# openh264 libraries -pushd gst-plugins-bad-%{gst_version} -CFLAGS="%{build_cflags} -I`pwd`/../codec/api" \ -CXXFLAGS="%{build_cflags} -I`pwd`/../codec/api" \ -LDFLAGS="%{build_ldflags} -L`pwd`/.." \ -%meson \ - --auto-features=disabled \ - -D package-name="Fedora gstreamer1-plugin-openh264 package" \ - -D package-origin="http://www.openh264.org/" \ - -D openh264=enabled -%meson_build -popd - %install %make_install @@ -133,63 +90,12 @@ EOF # Remove static libraries rm $RPM_BUILD_ROOT%{_libdir}/*.a -# Install the gstreamer plugin -pushd gst-plugins-bad-%{gst_version} -%meson_install - -# Register as an AppStream component to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/gstreamer-openh264.appdata.xml < - - - gstreamer-openh264 - CC0-1.0 - GStreamer Multimedia Codecs - H.264 - Multimedia playback for H.264 - -

- This addon includes a codec for H.264 playback and encoding. -

-

- These codecs can be used to encode and decode media files where the - format is not patent encumbered. -

-

- A codec decodes audio and video for playback or editing and is also - used for transmission or storage. - Different codecs are used in video-conferencing, streaming media and - video editing applications. -

- - http://gstreamer.freedesktop.org/ - https://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer - http://gstreamer.freedesktop.org/documentation/ - http://www.gnome.org/friends/ - - -EOF - -# Remove unwanted gst-plugins-bad files -rm -rf $RPM_BUILD_ROOT%{_bindir}/gst-transcoder-1.0 -rm -rf $RPM_BUILD_ROOT%{_includedir}/gstreamer-1.0/ -rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gstreamer-*.pc -rm -rf $RPM_BUILD_ROOT%{_libdir}/libgst*.so* -rm -rf $RPM_BUILD_ROOT%{_datadir}/gstreamer-1.0/ -popd - %files %license LICENSE %doc README.md %{_libdir}/libopenh264.so.7 -%{_libdir}/libopenh264.so.%{openh264_version} +%{_libdir}/libopenh264.so.%{version} %files devel %{_includedir}/wels/ @@ -204,10 +110,5 @@ popd %{_libdir}/firefox/defaults/pref/gmpopenh264.js %{_libdir}/mozilla/plugins/gmp-gmpopenh264/ -%files -n gstreamer1-plugin-openh264 -%{_datadir}/appdata/*.appdata.xml -%{_libdir}/gstreamer-1.0/libgstopenh264.so - - %changelog %autochangelog diff --git a/anda/lib/openh264/pre.rhai b/anda/lib/openh264/pre.rhai deleted file mode 100644 index 6cfc5a8b63..0000000000 --- a/anda/lib/openh264/pre.rhai +++ /dev/null @@ -1,14 +0,0 @@ -let cwd = "anda/lib/openh264"; -let spec = open_file("anda/lib/openh264/openh264.spec").read_string(); -let gst = find("%global gst_version ([\\d.]+)", spec, 1); -print(`:: found gst version ${gst}`); -let out = sh(`wget https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${gst}.tar.xz`, cwd); -//print(":: wget stdout below"); -//print(out.sh_stdout()); -//print(":: wget stderr below"); -//print(out.sh_stderr()); -out = sh(`sh gst-p-bad-cleanup.sh gst-plugins-bad-${gst}.tar.xz`, cwd); -//print(":: script stdout below"); -//print(out.sh_stdout()); -//print(":: script stderr below"); -//print(out.sh_stderr()); diff --git a/anda/lib/openh264/update.rhai b/anda/lib/openh264/update.rhai index 82c75d7110..49357985c5 100644 --- a/anda/lib/openh264/update.rhai +++ b/anda/lib/openh264/update.rhai @@ -1,6 +1,4 @@ rpm.global("commit1", gh_commit("mozilla/gmp-api")); let h264 = gh("cisco/openh264"); h264.crop(1); -rpm.global("openh264_version", h264); -let html = get("https://gstreamer.freedesktop.org/src/gst-plugins-bad/?C=N;O=D"); -rpm.global("gst_version", find("gst-plugins-bad-([\\d.]+).tar.xz", html, 1)); +rpm.version(h264); From ea868257a6e48039dc5564c6084a89535429603d Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 26 Jun 2024 04:40:12 -0700 Subject: [PATCH 12/14] fix(anki-qt5): fix usage of %patch (#1386) (#1390) (cherry picked from commit af8cacd84bd475bc654275458e84b68c8927fa6c) Co-authored-by: madomado --- anda/apps/anki-qt5/anki-qt5.spec | 2 +- anda/langs/python/protobuf/python3-protobuf.spec | 2 +- anda/lib/libindicator/terra-libindicator.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/anda/apps/anki-qt5/anki-qt5.spec b/anda/apps/anki-qt5/anki-qt5.spec index 049a7b995e..65f9cbc920 100644 --- a/anda/apps/anki-qt5/anki-qt5.spec +++ b/anda/apps/anki-qt5/anki-qt5.spec @@ -22,7 +22,7 @@ Anki is based on a theory called spaced repetition. %prep git clone https://github.com/ankitects/anki . git checkout %version -%patch1 -p1 +%patch 1 -p1 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5 diff --git a/anda/langs/python/protobuf/python3-protobuf.spec b/anda/langs/python/protobuf/python3-protobuf.spec index 55cc824ced..c9523248de 100644 --- a/anda/langs/python/protobuf/python3-protobuf.spec +++ b/anda/langs/python/protobuf/python3-protobuf.spec @@ -3,7 +3,7 @@ Name: python-%{pypi_name} Version: 5.27.1 -Release: 1%?dist +Release: 2%?dist Summary: Protocol Buffers License: BSD-3-Clause diff --git a/anda/lib/libindicator/terra-libindicator.spec b/anda/lib/libindicator/terra-libindicator.spec index 669f39e316..611037c11a 100644 --- a/anda/lib/libindicator/terra-libindicator.spec +++ b/anda/lib/libindicator/terra-libindicator.spec @@ -57,7 +57,7 @@ developing applications that use %{name}-gtk3. %prep %setup -q -c -%patch1 -p1 -b .orig +%patch 1 -p1 -b .orig # Remove all IDO references # This is only needed for tools/indicator-loader.c sed -i '6d' ./Makefile.am From bbfdb9151a40070f87ef1806fdd1c2aec28da984 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 26 Jun 2024 19:56:51 +0000 Subject: [PATCH 13/14] bump: discord-canary-openasar discord-canary --- anda/apps/discord-canary-openasar/discord-canary-openasar.spec | 2 +- anda/apps/discord-canary/discord-canary.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec index 24fa970523..5043d216b9 100644 --- a/anda/apps/discord-canary-openasar/discord-canary-openasar.spec +++ b/anda/apps/discord-canary-openasar/discord-canary-openasar.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary-openasar -Version: 0.0.437 +Version: 0.0.438 Release: 1%?dist Summary: A snappier Discord rewrite with features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-canary/discord-canary.spec b/anda/apps/discord-canary/discord-canary.spec index e68cc7c52c..717552ea4d 100644 --- a/anda/apps/discord-canary/discord-canary.spec +++ b/anda/apps/discord-canary/discord-canary.spec @@ -6,7 +6,7 @@ %global __provides_exclude_from %{_datadir}/%{name}/.*\\.so Name: discord-canary -Version: 0.0.437 +Version: 0.0.438 Release: 1%?dist Summary: Free Voice and Text Chat for Gamers URL: discord.com From e1a4779cb0ee9393af40d94efce4b4585e8e2467 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 26 Jun 2024 21:10:19 -0700 Subject: [PATCH 14/14] add: zed-nightly (#1377) (#1394) * wip * remove old desktop file * remove --frozen from build * bump commit and use correct version * check Cargo.toml for version * fix spacing in anda.hcl * slow down zed build * run with 4 jobs * zed-nightly(anda): tag as large * ci: if package is labelled as large, use lg runners for x86 * don't slow down build * Update zed-nightly.spec Signed-off-by: june <159748074+june-fish@users.noreply.github.com> * Update zed-nightly.spec Signed-off-by: june <159748074+june-fish@users.noreply.github.com> * use rpm profile * use correct paths for installing zed binaries * remove unneded debug_package line * use cargo_install macro * Revert "use cargo_install macro" This reverts commit a03c3b3a69f137c6747ba9d7074bd23c6e505e95. * don't mangle sources * reorganize zed to prepare for multiple packages --------- Signed-off-by: june <159748074+june-fish@users.noreply.github.com> Co-authored-by: Cappy Ishihara Co-authored-by: lea Co-authored-by: madomado (cherry picked from commit 2291a214d93ec9f48b32c119ad4d2be20c4a82dd) Co-authored-by: june <159748074+june-fish@users.noreply.github.com> --- anda/devs/zed/nightly/anda.hcl | 9 +++ anda/devs/zed/nightly/update.rhai | 9 +++ anda/devs/zed/nightly/zed-nightly.spec | 97 ++++++++++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 anda/devs/zed/nightly/anda.hcl create mode 100644 anda/devs/zed/nightly/update.rhai create mode 100644 anda/devs/zed/nightly/zed-nightly.spec diff --git a/anda/devs/zed/nightly/anda.hcl b/anda/devs/zed/nightly/anda.hcl new file mode 100644 index 0000000000..e92820997f --- /dev/null +++ b/anda/devs/zed/nightly/anda.hcl @@ -0,0 +1,9 @@ +project pkg { + rpm { + spec = "zed-nightly.spec" + } + labels { + nightly = 1 + large = 1 + } +} diff --git a/anda/devs/zed/nightly/update.rhai b/anda/devs/zed/nightly/update.rhai new file mode 100644 index 0000000000..ac2e45147e --- /dev/null +++ b/anda/devs/zed/nightly/update.rhai @@ -0,0 +1,9 @@ +if filters.contains("nightly") { + rpm.global("commit", gh_commit("zed-industries/zed")); + if rpm.changed() { + let v = find("(\\d+\\.\\d+\\d+\\.\\d+)", find("\nversion = \"(\\d+\\.\\d+\\d+\\.\\d+)\"\n", gh_rawfile("zed-industries/zed", "main", "crates/zed/Cargo.toml"), 1), 1); + rpm.global("ver", v); + rpm.global("commit_date", date()); + rpm.release(); + } +} diff --git a/anda/devs/zed/nightly/zed-nightly.spec b/anda/devs/zed/nightly/zed-nightly.spec new file mode 100644 index 0000000000..594e233c84 --- /dev/null +++ b/anda/devs/zed/nightly/zed-nightly.spec @@ -0,0 +1,97 @@ +%global commit 0129d4e2506d5ec5e50ef0968382770b9abec390 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20240619 +%global ver 0.142.0 + +%bcond_without check + +# Exclude input files from mangling +%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$ + +%global crate zed +%global app_id dev.zed.Zed-Nightly + +Name: zed-nightly +Version: %ver^%commit_date.%shortcommit +Release: 1%?dist +Summary: Zed is a high-performance, multiplayer code editor + +License: MIT +URL: https://zed.dev/ +Source0: https://github.com/zed-industries/zed/archive/%{commit}.zip + +Conflicts: zed +Provides: zed + +BuildRequires: cargo-rpm-macros >= 24 +BuildRequires: anda-srpm-macros +BuildRequires: gcc +BuildRequires: g++ +BuildRequires: clang +BuildRequires: mold +BuildRequires: alsa-lib-devel +BuildRequires: fontconfig-devel +BuildRequires: wayland-devel +BuildRequires: libxkbcommon-x11-devel +BuildRequires: openssl-devel +BuildRequires: libzstd-devel +BuildRequires: perl-FindBin +BuildRequires: perl-IPC-Cmd +BuildRequires: perl-File-Compare +BuildRequires: perl-File-Copy +BuildRequires: perl-lib +BuildRequires: vulkan-loader + +%description +Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter. + +%prep +%autosetup -n %{crate}-%{commit} -p1 +%cargo_prep_online + +export DO_STARTUP_NOTIFY="true" +export APP_ID="%app_id" +export APP_ICON="%app_id" +export APP_NAME="Zed Nightly" +export APP_CLI="zed" +export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra." +export ZED_RELEASE_CHANNEL=nightly +export BRANDING_LIGHT="#e9aa6a" +export BRANDING_DARK="#1a5fb4" + +echo "StartupWMClass=$APP_ID" >> crates/zed/resources/zed.desktop.in +envsubst < "crates/zed/resources/zed.desktop.in" > $APP_ID.desktop # from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=zed-git#n52 + +envsubst < "crates/zed/resources/flatpak/zed.metainfo.xml.in" > $APP_ID.metainfo.xml + +%build +export ZED_UPDATE_EXPLANATION="Run dnf up to update Zed Nightly from Terra." +echo "nightly" > crates/zed/RELEASE_CHANNEL + +%cargo_build -- --package zed --package cli +script/generate-licenses + +%install +install -Dm755 target/rpm/zed %{buildroot}%{_libexecdir}/zed-editor +install -Dm755 target/rpm/cli %{buildroot}%{_bindir}/zed + +install -Dm644 %app_id.desktop %{buildroot}%{_datadir}/applications/%app_id.desktop +install -Dm644 crates/zed/resources/app-icon-nightly.png %{buildroot}%{_datadir}/pixmaps/%app_id.png + +install -Dm644 %app_id.metainfo.xml %{buildroot}%{_metainfodir}/%app_id.metainfo.xml + +%if %{with check} +%check +%cargo_test +%endif + +%files +%{_libexecdir}/zed-editor +%{_bindir}/zed +%{_datadir}/applications/%app_id.desktop +%{_datadir}/pixmaps/%app_id.png +%{_metainfodir}/%app_id.metainfo.xml +%license assets/licenses.md + +%changelog +%autochangelog