Bump version: 3.4 → 3.5

.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 3.2
+current_version = 3.5
 parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
 serialize = 
 	{major}.{minor}

Makefile

@@ -82,10 +82,11 @@ all: $(USTR) $(DUMP)
 
 
 install: $(USTR) $(DUMP)
-	install -Dm755 $(USTR) $(DESTDIR)$(PREFIX)/bin/$(USTR)
-	install -Dm755 $(DUMP) $(DESTDIR)$(PREFIX)/bin/$(DUMP)
-	install -Dm644 man/$(USTR).1 $(DESTDIR)$(MANPREFIX)/man1/$(USTR).1
-	install -Dm644 man/$(DUMP).1 $(DESTDIR)$(MANPREFIX)/man1/$(DUMP).1
+	mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(MANPREFIX)/man1
+	install -m755 $(USTR) $(DESTDIR)$(PREFIX)/bin/$(USTR)
+	install -m755 $(DUMP) $(DESTDIR)$(PREFIX)/bin/$(DUMP)
+	install -m644 man/$(USTR).1 $(DESTDIR)$(MANPREFIX)/man1/$(USTR).1
+	install -m644 man/$(DUMP).1 $(DESTDIR)$(MANPREFIX)/man1/$(DUMP).1
 	gzip $(DESTDIR)$(MANPREFIX)/man1/$(USTR).1
 	gzip $(DESTDIR)$(MANPREFIX)/man1/$(DUMP).1
 

man/ustreamer-dump.1

@@ -1,6 +1,6 @@
 .\" Manpage for ustreamer-dump.
 .\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
-.TH USTREAMER-DUMP 1 "version 3.2" "January 2021"
+.TH USTREAMER-DUMP 1 "version 3.5" "January 2021"
 
 .SH NAME
 ustreamer-dump \- Dump uStreamer's memory sink to file

man/ustreamer.1

@@ -1,6 +1,6 @@
 .\" Manpage for ustreamer.
 .\" Open an issue or pull request to https://github.com/pikvm/ustreamer to correct errors or typos
-.TH USTREAMER 1 "version 3.2" "November 2020"
+.TH USTREAMER 1 "version 3.5" "November 2020"
 
 .SH NAME
 ustreamer \- stream MJPG video from any V4L2 device to the network

pkg/arch/PKGBUILD

@@ -3,7 +3,7 @@
 
 
 pkgname=ustreamer
-pkgver=3.2
+pkgver=3.5
 pkgrel=1
 pkgdesc="Lightweight and fast MJPG-HTTP streamer"
 url="https://github.com/pikvm/ustreamer"
@@ -25,6 +25,10 @@ build() {
 	local _options="WITH_GPIO=1"
 	[ -e /opt/vc/include/IL/OMX_Core.h ] && _options="$_options WITH_OMX=1"
 
+	# LD does not link mmal with this option
+	LDFLAGS="${LDFLAGS//--as-needed/}"
+	LDFLAGS="${LDFLAGS//,,/,}"
+
 	make $_options CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $MAKEFLAGS
 }
 

pkg/openwrt/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ustreamer
-PKG_VERSION:=3.2
+PKG_VERSION:=3.5
 PKG_RELEASE:=1
 PKG_MAINTAINER:=Maxim Devaev <mdevaev@gmail.com>
 

src/libs/config.h

@@ -23,5 +23,5 @@
 #pragma once
 
 #ifndef VERSION
-#	define VERSION "3.2"
+#	define VERSION "3.5"
 #endif

src/ustreamer/h264/encoder.c

@@ -250,7 +250,9 @@ static void _h264_encoder_cleanup(h264_encoder_s *enc) {
 
 #	undef DISABLE_PORT
 
-	enc->wrapper->status = MMAL_SUCCESS; // Это реально надо?
+	if (enc->wrapper) {
+		enc->wrapper->status = MMAL_SUCCESS; // Это реально надо?
+	}
 
 	enc->last_online = -1;
 	enc->ready = false;