Compare commits

...

4 Commits
v0.1 ... v0.3

Author SHA1 Message Date
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
Devaev Maxim
eadec8b7a1 Bump version: 0.1 → 0.2 2018-09-25 10:38:43 +03:00
Devaev Maxim
2d049818dd PKGBUILD fix 2018-09-25 10:38:32 +03:00
4 changed files with 7 additions and 6 deletions

View File

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

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 src/ustreamer-* src/v*.tar.gz v*.tar.gz

View File

@@ -3,7 +3,7 @@
pkgname=ustreamer
pkgver=0.1
pkgver=0.3
pkgrel=1
pkgdesc="Lightweight and fast MJPG-HTTP streamer"
url="https://github.com/pi-kvm/ustreamer"
@@ -19,7 +19,7 @@ md5sums=(SKIP)
build() {
cd $srcdir
rm -rf $pkgname-build
cp -r pi-kvm-$pkgver/ustreamer $pkgname-build
cp -r ustreamer-$pkgver $pkgname-build
cd $pkgname-build
make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $MAKEFLAGS
}

View File

@@ -21,4 +21,4 @@
#pragma once
#define VERSION "0.1"
#define VERSION "0.3"