Bump version: 3.8 → 3.9

.bumpversion.cfg

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

Makefile

@@ -8,7 +8,7 @@ MANPREFIX ?= $(PREFIX)/share/man
 
 CC ?= gcc
 PY ?= python3
-CFLAGS ?= -O3 -MD
+CFLAGS ?= -O3
 LDFLAGS ?=
 
 RPI_VC_HEADERS ?= /opt/vc/include
@@ -20,7 +20,8 @@ LINTERS_IMAGE ?= $(USTR)-linters
 
 
 # =====
-override CFLAGS += -c -std=c11 -Wall -Wextra -D_GNU_SOURCE
+_CFLAGS = -MD -c -std=c11 -Wall -Wextra -D_GNU_SOURCE $(CFLAGS)
+_LDFLAGS = $(LDFLAGS)
 
 _COMMON_LIBS = -lm -ljpeg -pthread -lrt
 
@@ -48,7 +49,7 @@ endef
 
 ifneq ($(call optbool,$(WITH_OMX)),)
 _USTR_LIBS += -lbcm_host -lvcos -lvcsm -lopenmaxil -lmmal -lmmal_core -lmmal_util -lmmal_vc_client -lmmal_components -L$(RPI_VC_LIBS)
-override CFLAGS += -DWITH_OMX -DOMX_SKIP64BIT -I$(RPI_VC_HEADERS)
+override _CFLAGS += -DWITH_OMX -DOMX_SKIP64BIT -I$(RPI_VC_HEADERS)
 _USTR_SRCS += $(shell ls \
 	src/ustreamer/encoders/omx/*.c \
 	src/ustreamer/h264/*.c \
@@ -58,14 +59,14 @@ endif
 
 ifneq ($(call optbool,$(WITH_GPIO)),)
 _USTR_LIBS += -lgpiod
-override CFLAGS += -DWITH_GPIO
+override _CFLAGS += -DWITH_GPIO
 _USTR_SRCS += $(shell ls src/ustreamer/gpio/*.c)
 endif
 
 
 WITH_PTHREAD_NP ?= 1
 ifneq ($(call optbool,$(WITH_PTHREAD_NP)),)
-override CFLAGS += -DWITH_PTHREAD_NP
+override _CFLAGS += -DWITH_PTHREAD_NP
 endif
 
 
@@ -74,7 +75,7 @@ ifneq ($(call optbool,$(WITH_SETPROCTITLE)),)
 ifeq ($(shell uname -s | tr A-Z a-z),linux)
 _USTR_LIBS += -lbsd
 endif
-override CFLAGS += -DWITH_SETPROCTITLE
+override _CFLAGS += -DWITH_SETPROCTITLE
 endif
 
 
@@ -108,27 +109,27 @@ regen:
 $(USTR): $(_USTR_SRCS:%.c=$(BUILD)/%.o)
 #	$(info ========================================)
 	$(info == LD $@)
-	@ $(CC) $^ -o $@ $(LDFLAGS) $(_USTR_LIBS)
+	@ $(CC) $^ -o $@ $(_LDFLAGS) $(_USTR_LIBS)
 #	$(info :: CC      = $(CC))
 #	$(info :: LIBS    = $(_USTR_LIBS))
-#	$(info :: CFLAGS  = $(CFLAGS))
-#	$(info :: LDFLAGS = $(LDFLAGS))
+#	$(info :: CFLAGS  = $(_CFLAGS))
+#	$(info :: LDFLAGS = $(_LDFLAGS))
 
 
 $(DUMP): $(_DUMP_SRCS:%.c=$(BUILD)/%.o)
 #	$(info ========================================)
 	$(info == LD $@)
-	@ $(CC) $^ -o $@ $(LDFLAGS) $(_DUMP_LIBS)
+	@ $(CC) $^ -o $@ $(_LDFLAGS) $(_DUMP_LIBS)
 #	$(info :: CC      = $(CC))
 #	$(info :: LIBS    = $(_DUMP_LIBS))
-#	$(info :: CFLAGS  = $(CFLAGS))
-#	$(info :: LDFLAGS = $(LDFLAGS))
+#	$(info :: CFLAGS  = $(_CFLAGS))
+#	$(info :: LDFLAGS = $(_LDFLAGS))
 
 
 $(BUILD)/%.o: %.c
 	$(info -- CC $<)
 	@ mkdir -p $(dir $@) || true
-	@ $(CC) $< -o $@ $(CFLAGS)
+	@ $(CC) $< -o $@ $(_CFLAGS)
 
 
 python:

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.7" "January 2021"
+.TH USTREAMER-DUMP 1 "version 3.9" "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.7" "November 2020"
+.TH USTREAMER 1 "version 3.9" "November 2020"
 
 .SH NAME
 ustreamer \- stream MJPG video from any V4L2 device to the network

pkg/arch/PKGBUILD

@@ -3,20 +3,20 @@
 
 
 pkgname=ustreamer
-pkgver=3.7
+pkgver=3.9
 pkgrel=1
 pkgdesc="Lightweight and fast MJPG-HTTP streamer"
 url="https://github.com/pikvm/ustreamer"
 license=(GPL)
 arch=(i686 x86_64 armv6h armv7h aarch64)
 depends=(libjpeg libevent libutil-linux libbsd libgpiod)
-# optional: raspberrypi-firmware for OMX encoder
 makedepends=(gcc make)
 source=(${pkgname}::"git+https://github.com/pikvm/ustreamer#commit=v${pkgver}")
 md5sums=(SKIP)
 
+
 _options="WITH_GPIO=1"
-if [ -e /usr/lib/python3 ]; then
+if [ -e /usr/bin/python3 ]; then
 	_options="$_options WITH_PYTHON=1"
 	depends+=(python)
 	makedepends+=(python-setuptools)
@@ -43,5 +43,5 @@ build() {
 
 package() {
 	cd "$srcdir/$pkgname-build"
-	make DESTDIR="$pkgdir" PREFIX=/usr install
+	make $_options DESTDIR="$pkgdir" PREFIX=/usr install
 }

pkg/openwrt/Makefile

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

python/setup.py

@@ -6,7 +6,7 @@ from distutils.core import setup
 if __name__ == "__main__":
     setup(
         name="ustreamer",
-        version="3.7",
+        version="3.9",
         description="uStreamer tools",
         author="Maxim Devaev",
         author_email="mdevaev@gmail.com",

src/libs/config.h

@@ -23,5 +23,5 @@
 #pragma once
 
 #ifndef VERSION
-#	define VERSION "3.7"
+#	define VERSION "3.9"
 #endif