Fix versioning

libavtransport/avtransport.c

@@ -29,6 +29,7 @@
 #include <string.h>
 
 #include <avtransport/avtransport.h>
+#include <avtransport/version.h>
 
 #include "common.h"
 
@@ -88,3 +89,11 @@ void avt_log(void *ctx, enum AVTLogLevel level, const char *fmt, ...)
 
     va_end(args);
 }
+
+uint32_t avt_version_int(void)
+{
+    return (AVTRANSPORT_VERSION_MAJOR << 16) |
+           (AVTRANSPORT_VERSION_MINOR <<  8) |
+           (AVTRANSPORT_VERSION_MICRO <<  0);
+
+}

libavtransport/connection.c

@@ -25,6 +25,7 @@
  */
 
 #include <stdlib.h>
+#include <avtransport/version.h>
 
 #include "connection_internal.h"
 #include "protocol_common.h"
@@ -87,14 +88,14 @@ static int send_session_start_pkt(AVTConnection *conn)
         .pkt = AVT_SESSION_START_HDR(
             .session_seq = conn->session_seq,
             .session_flags = 0x0,
-            .producer_major = PROJECT_VERSION_MAJOR,
-            .producer_minor = PROJECT_VERSION_MINOR,
-            .producer_micro = PROJECT_VERSION_MICRO,
+            .producer_major = AVTRANSPORT_VERSION_MAJOR,
+            .producer_minor = AVTRANSPORT_VERSION_MINOR,
+            .producer_micro = AVTRANSPORT_VERSION_MICRO,
         ),
     };
 
     memcpy(p.pkt.session_start.session_uuid, conn->addr.uuid, 16);
-    memccpy(p.pkt.session_start.producer_name, PROJECT_NAME,
+    memccpy(p.pkt.session_start.producer_name, "avtransport",
             '\0', sizeof(p.pkt.session_start.producer_name));
 
     int err = avt_scheduler_push(&conn->out_scheduler, &p);

libavtransport/include/avtransport/avtransport.h

@@ -30,6 +30,7 @@
 #include "connection.h"
 #include "send.h"
 #include "receive.h"
+#include "version.h"
 
 enum AVTLogLevel {
     AVT_LOG_QUIET    = -(1 << 0),

libavtransport/include/avtransport/meson.build

@@ -35,9 +35,9 @@ avtransport_spec_pub_headers = custom_target('packet*',
 
 # Version header
 version_h_data = configuration_data()
-version_h_data.set('AVTRANSPORT_API_VERSION_MAJOR', avtransport_api_version_major)
-version_h_data.set('AVTRANSPORT_API_VERSION_MINOR', avtransport_api_version_minor)
-version_h_data.set('AVTRANSPORT_API_VERSION_MICRO', avtransport_api_version_micro)
+version_h_data.set('AVTRANSPORT_VERSION_MAJOR', avtransport_version_major)
+version_h_data.set('AVTRANSPORT_VERSION_MINOR', avtransport_version_minor)
+version_h_data.set('AVTRANSPORT_VERSION_MICRO', avtransport_version_micro)
 version_h_target = configure_file(input: 'version.h.in',
     output: 'version.h',
     configuration: version_h_data

libavtransport/include/avtransport/version.h.in

@@ -27,16 +27,27 @@
 #ifndef AVTRANSPORT_VERSION_H
 #define AVTRANSPORT_VERSION_H
 
-#define AVTRANSPORT_API_VERSION_MAJOR @AVTRANSPORT_API_VERSION_MAJOR@
-#define AVTRANSPORT_API_VERSION_MINOR @AVTRANSPORT_API_VERSION_MINOR@
-#define AVTRANSPORT_API_VERSION_MICRO @AVTRANSPORT_API_VERSION_MICRO@
+#include <stdint.h>
+#include <avtransport/utils.h>
+
+/**
+ * Version from which the headers were built.
+ */
+#define AVTRANSPORT_VERSION_MAJOR @AVTRANSPORT_VERSION_MAJOR@
+#define AVTRANSPORT_VERSION_MINOR @AVTRANSPORT_VERSION_MINOR@
+#define AVTRANSPORT_VERSION_MICRO @AVTRANSPORT_VERSION_MICRO@
 
 /**
  * Extract versions from the value returned by
  * avtransport_version_int()
  */
-#define AVTRANSPORT_API_MAJOR(v) (((v) >> 16) & 0xFF)
-#define AVTRANSPORT_API_MINOR(v) (((v) >>  8) & 0xFF)
-#define AVTRANSPORT_API_MICRO(v) (((v) >>  0) & 0xFF)
+#define AVTRANSPORT_GET_VER_MAJOR(v) (((v) >> 16) & 0xFF)
+#define AVTRANSPORT_GET_VER_MINOR(v) (((v) >>  8) & 0xFF)
+#define AVTRANSPORT_GET_VER_MICRO(v) (((v) >>  0) & 0xFF)
+
+/**
+ * Returns the version of the library.
+ */
+AVT_API uint32_t avt_version_int(void);
 
 #endif /* AVTRANSPORT_VERSION_H */

libavtransport/io_null.c

@@ -28,13 +28,13 @@
 #include <stdlib.h>
 #include <errno.h>
 
+#include <avtransport/version.h>
+
 #include "io_common.h"
 #include "utils_internal.h"
 #include "bytestream.h"
 #include "packet_encode.h"
 
-#include "config.h"
-
 struct AVTIOCtx {
     uint64_t seq;
     avt_pos rpos;
@@ -85,11 +85,11 @@ static avt_pos null_input(AVTIOCtx *io, AVTBuffer *buf, size_t len,
     union AVTPacketData pkt = { .session_start = {
         .global_seq = io->seq++,
         .session_flags = 0x0,
-        .producer_major = PROJECT_VERSION_MAJOR,
-        .producer_minor = PROJECT_VERSION_MINOR,
-        .producer_micro = PROJECT_VERSION_MICRO,
+        .producer_major = AVTRANSPORT_VERSION_MAJOR,
+        .producer_minor = AVTRANSPORT_VERSION_MINOR,
+        .producer_micro = AVTRANSPORT_VERSION_MICRO,
     }};
-    memcpy(pkt.session_start.producer_name, PROJECT_NAME, strlen(PROJECT_NAME));
+    memcpy(pkt.session_start.producer_name, "avtransport", strlen("avtransport"));
 
     avt_encode_session_start(&bs, pkt.session_start);
 

libavtransport/meson.build

@@ -99,7 +99,7 @@ endif
 if host_machine.system() == 'windows'
     avtransport_soversion = ''
 else
-    avtransport_soversion = avtransport_api_version_major
+    avtransport_soversion = meson.project_version()
 endif
 
 avtransport_inc = include_directories('./include')
@@ -128,7 +128,7 @@ avtransport_lib = library('avtransport',
     sources: avtransport_spec_pub_headers,
     include_directories: avtransport_inc,
     dependencies: avtransport_deps_list,
-    version: avtransport_soname_version,
+    version: meson.project_version(),
     soversion: avtransport_soversion,
 )
 

meson.build

@@ -39,16 +39,9 @@ spec_file = files('draft-avtransport-spec.bs')
 
 # library version
 avtransport_version_split = meson.project_version().split('.')
-avtransport_ver_major = avtransport_version_split[0]
-avtransport_ver_minor = avtransport_version_split[1]
-avtransport_ver_micro = avtransport_version_split[2]
-
-# api version
-avtransport_soname_version    = '0.0.4'
-avtransport_api_version_split = avtransport_soname_version.split('.')
-avtransport_api_version_major = avtransport_api_version_split[0]
-avtransport_api_version_minor = avtransport_api_version_split[1]
-avtransport_api_version_micro = avtransport_api_version_split[2]
+avtransport_version_major = avtransport_version_split[0]
+avtransport_version_minor = avtransport_version_split[1]
+avtransport_version_micro = avtransport_version_split[2]
 
 # Python
 #============================================================================
@@ -153,13 +146,8 @@ endif
 # Configure file
 #============================================================================
 conf = configuration_data()
-conf.set_quoted('PROJECT_NAME', meson.project_name())
 conf.set_quoted('PROJECT_VERSION_STRING', meson.project_version())
 
-conf.set('PROJECT_VERSION_MAJOR', avtransport_ver_major)
-conf.set('PROJECT_VERSION_MINOR', avtransport_ver_minor)
-conf.set('PROJECT_VERSION_MICRO', avtransport_ver_micro)
-
 conf.set('CONFIG_DEFAULT_PORT', '8212')
 conf.set('CONFIG_DEFAULT_PORT_STR', '"8212"')
 conf.set('CONFIG_DEFAULT_TYPE', 'AVT_PROTOCOL_UDP')

tools/avcat.c

@@ -60,9 +60,9 @@ int main(int argc, char **argv)
     AVTContext *avt;
     AVTContextOptions ctx_opts = {
         .producer_name = "avcat",
-        .producer_ver = { PROJECT_VERSION_MAJOR,
-                          PROJECT_VERSION_MICRO,
-                          PROJECT_VERSION_MINOR },
+        .producer_ver = { AVTRANSPORT_VERSION_MAJOR,
+                          AVTRANSPORT_VERSION_MICRO,
+                          AVTRANSPORT_VERSION_MINOR },
     };
 
     ret = avt_init(&avt, &ctx_opts);