Compare commits

..

6 Commits
v0.2 ... v0.5

Author SHA1 Message Date
Devaev Maxim
2eb57866c2 Bump version: 0.4 → 0.5 2018-09-25 11:04:50 +03:00
Devaev Maxim
962a32e877 final cleanup 2018-09-25 11:04:39 +03:00
Devaev Maxim
3ddd1f603e Bump version: 0.3 → 0.4 2018-09-25 10:56:14 +03:00
Devaev Maxim
18368a00f5 removing pkg 2018-09-25 10:55:50 +03:00
Devaev Maxim
810a80ab09 Bump version: 0.2 → 0.3 2018-09-25 10:45:21 +03:00
Devaev Maxim
f7e30b5897 Fixed Makefile for PKGBUILD 2018-09-25 10:45:10 +03:00
5 changed files with 11 additions and 5 deletions

View File

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

5
.gitignore vendored
View File

@@ -1,3 +1,8 @@
/pkg/
/src/ustreamer-*/
/src/v*.tar.gz
/v*.tar.gz
/ustreamer-*.pkg.tar.xz
/vgcore.*
/ustreamer
*.o

View File

@@ -5,7 +5,7 @@ LDFLAGS ?=
CC = gcc
LIBS = -lm -ljpeg -pthread -levent -levent_pthreads
CFLAGS += -c -std=c99 -Wall -Wextra -D_GNU_SOURCE
override CFLAGS += -c -std=c99 -Wall -Wextra -D_GNU_SOURCE
SOURCES = $(shell ls src/*.c src/jpeg/*.c)
OBJECTS = $(SOURCES:.c=.o)
PROG = ustreamer
@@ -14,7 +14,7 @@ PROG = ustreamer
ifeq ($(shell ls -d /opt/vc/include 2>/dev/null), /opt/vc/include)
SOURCES += $(shell ls src/omx/*.c)
LIBS += -lbcm_host -lvcos -lopenmaxil -L/opt/vc/lib
CFLAGS += -DOMX_ENCODER -DOMX_SKIP64BIT -I/opt/vc/include
override CFLAGS += -DOMX_ENCODER -DOMX_SKIP64BIT -I/opt/vc/include
endif
@@ -56,3 +56,4 @@ push:
clean:
rm -f src/*.o src/{jpeg,omx}/*.o vgcore.* $(PROG)
rm -rf pkg src/$(PROG)-* src/v*.tar.gz v*.tar.gz $(PROG)-*.pkg.tar.xz

View File

@@ -3,7 +3,7 @@
pkgname=ustreamer
pkgver=0.2
pkgver=0.5
pkgrel=1
pkgdesc="Lightweight and fast MJPG-HTTP streamer"
url="https://github.com/pi-kvm/ustreamer"

View File

@@ -21,4 +21,4 @@
#pragma once
#define VERSION "0.2"
#define VERSION "0.5"