Release Cubemap 1.5.2.

diff --git a/Makefile.in b/Makefile.in
index a44f14520869f461a074a2dc88fa403d1576ee8b..c910c259810de76f604043ecad717dee92cf6709 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,6 +54,7 @@ install:
        $(INSTALL) -m 755 -o root -g root cubemap $(DESTDIR)$(prefix)/bin/cubemap
        $(INSTALL) -m 755 -o root -g root munin/cubemap munin/cubemap_input $(DESTDIR)$(prefix)/share/munin/plugins/
 ifeq (@have_ffmpeg@,yes)
+       $(INSTALL) -m 755 -o root -g root -d $(DESTDIR)$(libdir)
        $(INSTALL) -m 755 -o root -g root ffmpeg_metacube_hack.so $(DESTDIR)$(libdir)/
 endif
        gzip -c cubemap.1 > $(DESTDIR)$(prefix)/share/man/man1/cubemap.1.gz

diff --git a/NEWS b/NEWS
index 10d5c0e6931c1e9b4e080df63d2bd9d19ec302a1..7c75ba445ca80b652a3625f9cea2f750d6e454f7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Cubemap 1.5.2, 2024-08-11
+
+  * Fix compatibility with FFmpeg 7.0.
+
+
 Cubemap 1.5.1, 2023-12-17
 
   * Use systemd.pc to place systemd system units.

diff --git a/configure.ac b/configure.ac
index 1d9bc396fb9c63b80e22723c50482d5f478fcc3c..6cefef33b3a6f09920c4cfa3fbf6ac4310bcd125 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_CONFIG_MACRO_DIR([m4])
-AC_INIT(cubemap, 1.5.2-pre)
+AC_INIT(cubemap, 1.5.2)
 
 AC_CONFIG_SRCDIR(main.cpp)
 

diff --git a/ffmpeg_metacube_hack.c b/ffmpeg_metacube_hack.c
index 4398cd64153990e40028862928c1cebb74139e87..7c1a399763007b0f5f8ab1220093d5cf819a20ec 100644 (file)
--- a/ffmpeg_metacube_hack.c
+++ b/ffmpeg_metacube_hack.c
@@ -24,6 +24,15 @@
 #include <sys/signal.h>
 #include "metacube2.h"
 
+/* Used as a shim between FFmpeg pre- and post-7.0. */
+#include <libavformat/version_major.h>
+
+#if LIBAVFORMAT_VERSION_MAJOR < 61
+#define FF_MAYBE_CONST
+#else
+#define FF_MAYBE_CONST const
+#endif
+
 static pthread_once_t metacube2_crc_once_control = PTHREAD_ONCE_INIT;
 static AVCRC metacube2_crc_table[257];
 
@@ -37,7 +46,7 @@ struct ContextExtraData {
        AVIOContext *ctx;       // The context we are associating data with.
        bool seen_sync_point;
        void *old_opaque;
-       int (*old_write_data_type)(void *opaque, uint8_t * buf,
+       int (*old_write_data_type)(void *opaque, FF_MAYBE_CONST uint8_t * buf,
                                   int buf_size,
                                   enum AVIODataMarkerType type,
                                   int64_t time);
@@ -124,7 +133,7 @@ static uint16_t metacube2_compute_crc_ff(const struct
        return av_bswap16(crc);
 }
 
-static int write_packet(void *opaque, uint8_t * buf, int buf_size,
+static int write_packet(void *opaque, FF_MAYBE_CONST uint8_t * buf, int buf_size,
                        enum AVIODataMarkerType type, int64_t time)
 {
        if (buf_size < 0) {

diff --git a/version.h b/version.h
index fe89b311e34d52c5bf12a387e19d291ddd535086..c4ed9d3c5efbbd359f99718064d8af9e9cb56fa1 100644 (file)
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #ifndef _VERSION_H
 #define _VERSION_H
 
-#define SERVER_VERSION "1.5.2-pre"
+#define SERVER_VERSION "1.5.2"
 #define SERVER_IDENTIFICATION "Cubemap/" SERVER_VERSION
 
 #endif  // !defined(_VERSION_H)