commit: 66bfac9c88aeae2ce27e9951ced86f241e9675ec Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Sun May 11 13:31:58 2025 +0000 Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> CommitDate: Sun May 11 13:31:58 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=66bfac9c
gui-apps/mpvpaper: drop 1.7 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> gui-apps/mpvpaper/Manifest | 1 - gui-apps/mpvpaper/files/mpvpaper-1.7-gcc15.patch | 148 ----------------------- gui-apps/mpvpaper/mpvpaper-1.7.ebuild | 43 ------- 3 files changed, 192 deletions(-) diff --git a/gui-apps/mpvpaper/Manifest b/gui-apps/mpvpaper/Manifest index a5735caca..e773bb87c 100644 --- a/gui-apps/mpvpaper/Manifest +++ b/gui-apps/mpvpaper/Manifest @@ -1,2 +1 @@ -DIST mpvpaper-1.7.tar.gz 89594 BLAKE2B 103582b7e5cce6293572c21299c125ef112441d1cec355e133bf54cb299123cde77deb92cd19f819102a0e6389018d4027965bb66070098a01c06f11c30b64c4 SHA512 1087d86e1586e5f5c36494787f4b981ddfd48c576add9b2758df7ed05fd219078e3fce2b135cb744d93211db254fe2e1a8b3ce2f107358fc6af3d25045ad43b6 DIST mpvpaper-1.8.tar.gz 90036 BLAKE2B 4166cfa3f87686176d379c6240296a8bcf290f2c26a349ff0177d7585b36304af117e255d677b9d70a23327745abcabd2a07efb3bf760b16f34e65e81ca7a80c SHA512 8d4b0dd682d57073bd0974273d01458139566c1eb0b2b02670dd8cba625c4a993c1a8a4464015a30c061bd43ad0713c3cafb9c9bfa55749289af5acd9497cb3b diff --git a/gui-apps/mpvpaper/files/mpvpaper-1.7-gcc15.patch b/gui-apps/mpvpaper/files/mpvpaper-1.7-gcc15.patch deleted file mode 100644 index a112a7fb3..000000000 --- a/gui-apps/mpvpaper/files/mpvpaper-1.7-gcc15.patch +++ /dev/null @@ -1,148 +0,0 @@ -https://bugs.gentoo.org/945227 -https://github.com/GhostNaN/mpvpaper/pull/90 ---- a/src/holder.c -+++ b/src/holder.c -@@ -45,8 +45,6 @@ static struct { - int start_time; - } halt_info = {NULL, NULL, false, 0}; - --static void nop() {} -- - static void revive_mpvpaper() { - // Get the "real" cwd - char exe_dir[1024]; -@@ -197,6 +195,16 @@ static void create_layer_surface(struct display_output *output) { - wl_surface_commit(output->surface); - } - -+static void output_geometry(void *data, struct wl_output *wl_output, int32_t x, int32_t y, int32_t physical_width, -+ int32_t physical_height, int32_t subpixel, const char *make, const char *model, int32_t transform) { -+ // NOP -+} -+ -+static void output_mode(void *data, struct wl_output *wl_output, uint32_t flags, int32_t width, int32_t height, -+ int32_t refresh) { -+ // NOP -+} -+ - static void output_name(void *data, struct wl_output *wl_output, const char *name) { - (void)wl_output; - -@@ -221,6 +229,10 @@ static void output_done(void *data, struct wl_output *wl_output) { - destroy_display_output(output); - } - -+static void output_scale(void *data, struct wl_output *wl_output, int32_t scale) { -+ // NOP -+} -+ - static void output_description(void *data, struct wl_output *wl_output, const char *description) { - (void)wl_output; - -@@ -238,10 +250,10 @@ static void output_description(void *data, struct wl_output *wl_output, const ch - } - - static const struct wl_output_listener output_listener = { -- .geometry = nop, -- .mode = nop, -+ .geometry = output_geometry, -+ .mode = output_mode, - .done = output_done, -- .scale = nop, -+ .scale = output_scale, - .name = output_name, - .description = output_description, - }; ---- a/src/main.c -+++ b/src/main.c -@@ -88,8 +88,6 @@ static uint SLIDESHOW_TIME = 0; - static bool SHOW_OUTPUTS = false; - static int VERBOSE = 0; - --static void nop() {} -- - static void exit_cleanup() { - - // Give mpv a chance to finish -@@ -123,7 +121,7 @@ static void exit_mpvpaper(int reason) { - exit(reason); - } - --static void *exit_by_pthread() { -+static void *exit_by_pthread(void *_) { - exit_mpvpaper(EXIT_SUCCESS); - pthread_exit(NULL); - } -@@ -262,7 +260,7 @@ static char *check_watch_list(char **list) { - return NULL; - } - --static void *monitor_pauselist() { -+static void *monitor_pauselist(void *_) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); - bool list_paused = 0; - -@@ -286,7 +284,7 @@ static void *monitor_pauselist() { - pthread_exit(NULL); - } - --static void *monitor_stoplist() { -+static void *monitor_stoplist(void *_) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); - - while (halt_info.stoplist) { -@@ -303,7 +301,7 @@ static void *monitor_stoplist() { - pthread_exit(NULL); - } - --static void *handle_auto_pause() { -+static void *handle_auto_pause(void *_) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); - - while (halt_info.auto_pause) { -@@ -327,7 +325,7 @@ static void *handle_auto_pause() { - pthread_exit(NULL); - } - --static void *handle_auto_stop() { -+static void *handle_auto_stop(void *_) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); - - while (halt_info.auto_stop) { -@@ -344,7 +342,7 @@ static void *handle_auto_stop() { - pthread_exit(NULL); - } - --static void *handle_mpv_events() { -+static void *handle_mpv_events(void *_) { - pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL); - int mpv_paused = 0; - time_t start_time = time(NULL); -@@ -710,6 +708,16 @@ static void create_layer_surface(struct display_output *output) { - wl_surface_commit(output->surface); - } - -+static void output_geometry(void *data, struct wl_output *wl_output, int32_t x, int32_t y, int32_t physical_width, -+ int32_t physical_height, int32_t subpixel, const char *make, const char *model, int32_t transform) { -+ // NOP -+} -+ -+static void output_mode(void *data, struct wl_output *wl_output, uint32_t flags, int32_t width, int32_t height, -+ int32_t refresh) { -+ // NOP -+} -+ - static void output_name(void *data, struct wl_output *wl_output, const char *name) { - (void)wl_output; - -@@ -771,8 +779,8 @@ static void output_description(void *data, struct wl_output *wl_output, const ch - } - - static const struct wl_output_listener output_listener = { -- .geometry = nop, -- .mode = nop, -+ .geometry = output_geometry, -+ .mode = output_mode, - .done = output_done, - .scale = output_scale, - .name = output_name, diff --git a/gui-apps/mpvpaper/mpvpaper-1.7.ebuild b/gui-apps/mpvpaper/mpvpaper-1.7.ebuild deleted file mode 100644 index 2f7face77..000000000 --- a/gui-apps/mpvpaper/mpvpaper-1.7.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="A video wallpaper program for wlroots based wayland compositors" -HOMEPAGE="https://github.com/GhostNaN/mpvpaper"; - -inherit meson - -case "${PV}" in - 9999) - inherit git-r3 - EGIT_REPO_URI="https://github.com/GhostNaN/mpvpaper.git"; - ;; - *) - SRC_URI="https://github.com/GhostNaN/mpvpaper/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" -esac - -LICENSE="GPL-3" -SLOT="0" - -RDEPEND=" - dev-libs/wayland - media-libs/libglvnd - media-video/mpv:=[libmpv] -" -DEPEND=" - ${RDEPEND} - dev-libs/wayland-protocols -" -BDEPEND="dev-util/wayland-scanner" - -PATCHES=( - # bug #945227 - "${FILESDIR}/${P}-gcc15.patch" -) - -src_install() { - meson_src_install - newman mpvpaper.man mpvpaper.1 -}
