contrib/src/caca/SHA512SUMS

-1d08a45a742cbda2c80810e753b49588cb9073ef545a1d47537745c4e62dc79748a25907903ffee58676d9aa5b75c5e0658666429cf028e10c09157d418c8d19  libcaca-0.99.beta17.tar.gz
+ab03e6c7d17fd152b2d5e9161799531f5e87322e174cb9d25874700f5bc1acfaf8bc2736e733998dad906f793c5a0304740dd39eec04a5e4c3d181bb109b4f23  libcaca-0.99.beta20.tar.gz

contrib/src/caca/caca-fix-pkgconfig.patch

+diff -Naur libcaca-0.99.beta17.a/caca/caca.pc.in libcaca-0.99.beta17.b/caca/caca.pc.in
+--- libcaca-0.99.beta17.a/caca/caca.pc.in	2009-11-17 16:58:37.000000000 +0100
++++ libcaca-0.99.beta17.b/caca/caca.pc.in	2019-10-09 09:04:48.297412878 +0200
+@@ -9,5 +9,5 @@
+ Requires: 
+ Conflicts: 
+ Libs: -L${libdir} -lcaca
+-Libs.private: @ZLIB_LIBS@
+-Cflags: -I${includedir}
++Libs.private: @ZLIB_LIBS@ @CACA_LIBS@
++Cflags: -DCACA_STATIC -I${includedir}

contrib/src/caca/caca-osx-sdkofourchoice.patch

---- libcaca/configure.orig	2010-02-08 14:46:58.000000000 +0100
-+++ libcaca/configure	2010-08-09 17:46:59.000000000 +0200
-@@ -16785,33 +16785,9 @@
- done
- 
-   if test "${ac_cv_my_have_cocoa}" = "yes"; then
--    case x${target} in
--    xpowerpc*darwin*)
--      # 10.3 needed to link with X11
--      MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.3.9.sdk}"
--      GCC_VERSION="${GCC_VERSION:-3.3}"
--      ARCH="${ARCH:--arch ppc}"
--      MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--nostdinc -isystem ${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION} -isystem ${MACOSX_SDK}/usr/include}"
--      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:--nostdinc++ -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++ -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++/ppc-darwin -I${MACOSX_SDK}/usr/include/gcc/darwin/${GCC_VERSION}/c++/backward}"
--      MACOSX_SDK_LDFLAGS="${MACOSX_SDK_LDFLAGS:--L${MACOSX_SDK}/usr/lib/gcc/darwin -L${MACOSX_SDK}/usr/lib/gcc/darwin/${GCC_VERSION} -L${MACOSX_SDK}/usr/lib}"
--      ;;
--    x*86_64*darwin*)
--      MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.5.sdk}"
--      GCC_VERSION="${GCC_VERSION:-4.0}"
--      ARCH="${ARCH:--arch i386}"
--      MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--isysroot ${MACOSX_SDK}}"
--      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:-${MACOSX_SDK_CFLAGS}}"
--      ;;
--    x*86*darwin*)
--      MACOSX_SDK="${MACOSX_SDK:-/Developer/SDKs/MacOSX10.6.sdk}"
--      GCC_VERSION="${GCC_VERSION:-4.0}"
--      ARCH="${ARCH:--arch i386}"
--      MACOSX_SDK_CFLAGS="${MACOSX_SDK_CFLAGS:--isysroot ${MACOSX_SDK}}"
--      MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CXXFLAGS:-${MACOSX_SDK_CFLAGS}}"
--      ;;
--    esac
--    CC="${CC:-gcc-${GCC_VERSION}}"
--    CXX="${CXX:-g++-${GCC_VERSION}}"
-+    MACOSX_SDK=/Developer/SDKs/MacOSX10.5.sdk
-+    MACOSX_SDK_CFLAGS="-isysroot ${MACOSX_SDK}"
-+    MACOSX_SDK_CXXFLAGS="${MACOSX_SDK_CFLAGS}"
-     MACOSX_SDK_FRAMEWORKS="${MACOSX_SDK_FRAMEWORKS:--F${MACOSX_SDK}/System/Library/Frameworks}"
-     CPPFLAGS="${CPPFLAGS} ${ARCH} ${MACOSX_SDK_FRAMEWORKS}"
-     CFLAGS="${CFLAGS} ${MACOSX_SDK_CFLAGS}"

contrib/src/caca/caca-win32-static.patch

---- libcaca/caca/caca.h	2010-02-08 13:34:28.000000000 +0100
-+++ libcaca.new/caca/caca.h	2010-08-24 19:27:39.000000000 +0200
-@@ -31,7 +31,7 @@
- #if defined _DOXYGEN_SKIP_ME
- #elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT
- #   define __extern extern __declspec(dllexport)
--#elif defined _WIN32 && !defined __LIBCACA__
-+#elif defined _WIN32 && !defined __LIBCACA__ && defined __NULL
- #   define __extern extern __declspec(dllimport)
- #else
- #   define __extern extern

contrib/src/caca/rules.mak

 # CACA
-CACA_VERSION := 0.99.beta17
-CACA_URL := http://caca.zoy.org/files/libcaca/libcaca-$(CACA_VERSION).tar.gz
+CACA_VERSION := 0.99.beta20
+CACA_URL := https://github.com/cacalabs/libcaca/releases/download/v$(CACA_VERSION)/libcaca-$(CACA_VERSION).tar.gz
 
 ifndef HAVE_DARWIN_OS
 ifndef HAVE_LINUX # see VLC Trac 17251
@@ -8,7 +8,7 @@ PKGS += caca
 endif
 endif
 
-ifeq ($(call need_pkg,"caca >= 0.99.beta14"),)
+ifeq ($(call need_pkg,"caca >= 0.99.beta19"),)
 PKGS_FOUND += caca
 endif
 
@@ -20,23 +20,44 @@ $(TARBALLS)/libcaca-$(CACA_VERSION).tar.gz:
 caca: libcaca-$(CACA_VERSION).tar.gz .sum-caca
 	$(UNPACK)
 	$(APPLY) $(SRC)/caca/caca-fix-compilation-llvmgcc.patch
-	$(APPLY) $(SRC)/caca/caca-llvm-weak-alias.patch
-	$(APPLY) $(SRC)/caca/caca-osx-sdkofourchoice.patch
-	$(APPLY) $(SRC)/caca/caca-win32-static.patch
+	$(APPLY) $(SRC)/caca/caca-fix-pkgconfig.patch
+	$(call pkg_static,"caca/caca.pc.in")
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 	mv caca/config.sub caca/config.guess caca/.auto
 
 CACA_CONF := \
+	--disable-gl \
 	--disable-imlib2 \
 	--disable-doc \
+	--disable-cppunit \
+	--disable-zzuf \
 	--disable-ruby \
 	--disable-csharp \
 	--disable-cxx \
-	--disable-java
+	--disable-java \
+	--disable-python \
+	--disable-cocoa \
+	--disable-network \
+	--disable-vga \
+	--disable-imlib2
 ifdef HAVE_MACOSX
 CACA_CONF += --disable-x11
 endif
+ifdef HAVE_WIN32
+CACA_CONF += --disable-ncurses \
+    ac_cv_func_vsnprintf_s=yes \
+    ac_cv_func_sprintf_s=yes
+endif
+ifdef HAVE_LINUX
+CACA_CONF += --disable-ncurses
+endif
+
+CACA_CONF += \
+	MACOSX_SDK=$(MACOSX_SDK) \
+	MACOSX_SDK_CFLAGS=" " \
+	MACOSX_SDK_CXXFLAGS=" " \
+	CPPFLAGS="$(CPPFLAGS) -DCACA_STATIC"
 
 .caca: caca
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(CACA_CONF)

modules/video_output/caca.c

@@ -74,9 +74,9 @@ static void Place(vout_display_t *, vout_display_place_t *);
 
 /* */
 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, picture_t *picture, subpicture_t *subpic
 
     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, picture_t *picture, subpicture_t *subpic
     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, int query, va_list args)
 
     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, vout_display_place_t *place)
 
     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);