Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vlc for openSUSE:Factory checked in at 2022-11-24 12:22:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vlc (Old) and /work/SRC/openSUSE:Factory/.vlc.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vlc" Thu Nov 24 12:22:09 2022 rev:129 rq:1037462 version:3.0.17.4 Changes: -------- --- /work/SRC/openSUSE:Factory/vlc/vlc.changes 2022-11-09 12:56:45.216117284 +0100 +++ /work/SRC/openSUSE:Factory/.vlc.new.1597/vlc.changes 2022-11-24 12:22:13.600915289 +0100 @@ -1,0 +2,5 @@ +Thu Nov 17 10:55:57 UTC 2022 - Valentin Lefebvre <valentin.lefeb...@suse.com> + +- add vlc-caca-fix-to-0-99-beta20-version.patch: build with libcaca-0.99.beta20 + +------------------------------------------------------------------- New: ---- vlc-caca-fix-to-0-99-beta20-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vlc.spec ++++++ --- /var/tmp/diff_new_pack.gPRp9j/_old 2022-11-24 12:22:14.564921415 +0100 +++ /var/tmp/diff_new_pack.gPRp9j/_new 2022-11-24 12:22:14.572921466 +0100 @@ -60,6 +60,8 @@ Patch103: 0001-Port-OpenCV-facedetect-example-to-C-API.patch # PATCH-FIX-UPSTREAM https://trac.videolan.org/vlc/ticket/25473 dominic.may...@meditationstudies.org -- The maintainers of live555 changed connectionEndpointAddresss to getConnectionEndpointAddress, which now provides the address value by reference. Patch107: vlc-get-addr-by-ref-from-getConnectionEndpointAddress.patch +# PATCH-FIX-UPSTREAM vlc-caca-fix-to-0-99-beta20-version.patch -- Migrate to new API of libcaca in v0.99.beta20 +Patch108: vlc-caca-fix-to-0-99-beta20-version.patch BuildRequires: Mesa-devel BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.24 @@ -128,7 +130,7 @@ BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(aom) -BuildRequires: pkgconfig(caca) >= 0.99.beta14 +BuildRequires: pkgconfig(caca) >= 0.99.beta20 BuildRequires: pkgconfig(dbus-1) >= 1.6.0 BuildRequires: pkgconfig(dvdnav) > 4.9.0 BuildRequires: pkgconfig(dvdread) > 4.9.0 @@ -418,6 +420,7 @@ if pkg-config --atleast-version 2020.12.11 live555; then %patch107 -p1 fi +%patch108 -p1 ### And LUA 5.3.1 has some more API changes if pkg-config --atleast-version 5.3.1 lua; then ++++++ vlc-caca-fix-to-0-99-beta20-version.patch ++++++ Index: vlc-3.0.17.4/modules/video_output/caca.c =================================================================== --- vlc-3.0.17.4.orig/modules/video_output/caca.c +++ vlc-3.0.17.4/modules/video_output/caca.c @@ -74,9 +74,9 @@ static void Place(vout_display_t *, vout /* */ struct vout_display_sys_t { - cucul_canvas_t *cv; + caca_canvas_t *cv; caca_display_t *dp; - cucul_dither_t *dither; + caca_dither_t *dither; picture_pool_t *pool; vout_display_event_thread_t *et; @@ -153,9 +153,9 @@ static int Open(vlc_object_t *object) if (!sys) goto error; - sys->cv = cucul_create_canvas(0, 0); + sys->cv = caca_create_canvas(0, 0); if (!sys->cv) { - msg_Err(vd, "cannot initialize libcucul"); + msg_Err(vd, "cannot initialize libcaca"); goto error; } @@ -209,11 +209,11 @@ error: if (sys->pool) picture_pool_Release(sys->pool); if (sys->dither) - cucul_free_dither(sys->dither); + caca_free_dither(sys->dither); if (sys->dp) caca_free_display(sys->dp); if (sys->cv) - cucul_free_canvas(sys->cv); + caca_free_canvas(sys->cv); free(sys); } @@ -235,9 +235,9 @@ static void Close(vlc_object_t *object) if (sys->pool) picture_pool_Release(sys->pool); if (sys->dither) - cucul_free_dither(sys->dither); + caca_free_dither(sys->dither); caca_free_display(sys->dp); - cucul_free_canvas(sys->cv); + caca_free_canvas(sys->cv); #if defined(_WIN32) FreeConsole(); @@ -266,7 +266,7 @@ static void Prepare(vout_display_t *vd, if (!sys->dither) { /* Create the libcaca dither object */ - sys->dither = cucul_create_dither(32, + sys->dither = caca_create_dither(32, vd->source.i_visible_width, vd->source.i_visible_height, picture->p[0].i_pitch, @@ -284,12 +284,12 @@ static void Prepare(vout_display_t *vd, vout_display_place_t place; Place(vd, &place); - cucul_set_color_ansi(sys->cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_BLACK); - cucul_clear_canvas(sys->cv); + caca_set_color_ansi(sys->cv, CACA_DEFAULT, CACA_BLACK); + caca_clear_canvas(sys->cv); const int crop_offset = vd->source.i_y_offset * picture->p->i_pitch + vd->source.i_x_offset * picture->p->i_pixel_pitch; - cucul_dither_bitmap(sys->cv, place.x, place.y, + caca_dither_bitmap(sys->cv, place.x, place.y, place.width, place.height, sys->dither, &picture->p->p_pixels[crop_offset]); @@ -328,7 +328,7 @@ static int Control(vout_display_t *vd, i case VOUT_DISPLAY_CHANGE_SOURCE_CROP: if (sys->dither) - cucul_free_dither(sys->dither); + caca_free_dither(sys->dither); sys->dither = NULL; return VLC_SUCCESS; @@ -366,8 +366,8 @@ static void Place(vout_display_t *vd, vo vout_display_PlacePicture(place, &vd->source, vd->cfg, false); - const int canvas_width = cucul_get_canvas_width(sys->cv); - const int canvas_height = cucul_get_canvas_height(sys->cv); + const int canvas_width = caca_get_canvas_width(sys->cv); + const int canvas_height = caca_get_canvas_height(sys->cv); const int display_width = caca_get_display_width(sys->dp); const int display_height = caca_get_display_height(sys->dp);
