mirror of
https://github.com/pikvm/ustreamer.git
synced 2026-02-27 12:16:31 +00:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3ddd1f603e | ||
|
|
18368a00f5 | ||
|
|
810a80ab09 | ||
|
|
f7e30b5897 | ||
|
|
eadec8b7a1 | ||
|
|
2d049818dd |
@@ -1,7 +1,7 @@
|
|||||||
[bumpversion]
|
[bumpversion]
|
||||||
commit = True
|
commit = True
|
||||||
tag = True
|
tag = True
|
||||||
current_version = 0.1
|
current_version = 0.4
|
||||||
parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
|
parse = (?P<major>\d+)\.(?P<minor>\d+)(\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?)?
|
||||||
serialize =
|
serialize =
|
||||||
{major}.{minor}
|
{major}.{minor}
|
||||||
|
|||||||
5
Makefile
5
Makefile
@@ -5,7 +5,7 @@ LDFLAGS ?=
|
|||||||
|
|
||||||
CC = gcc
|
CC = gcc
|
||||||
LIBS = -lm -ljpeg -pthread -levent -levent_pthreads
|
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)
|
SOURCES = $(shell ls src/*.c src/jpeg/*.c)
|
||||||
OBJECTS = $(SOURCES:.c=.o)
|
OBJECTS = $(SOURCES:.c=.o)
|
||||||
PROG = ustreamer
|
PROG = ustreamer
|
||||||
@@ -14,7 +14,7 @@ PROG = ustreamer
|
|||||||
ifeq ($(shell ls -d /opt/vc/include 2>/dev/null), /opt/vc/include)
|
ifeq ($(shell ls -d /opt/vc/include 2>/dev/null), /opt/vc/include)
|
||||||
SOURCES += $(shell ls src/omx/*.c)
|
SOURCES += $(shell ls src/omx/*.c)
|
||||||
LIBS += -lbcm_host -lvcos -lopenmaxil -L/opt/vc/lib
|
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
|
endif
|
||||||
|
|
||||||
|
|
||||||
@@ -56,3 +56,4 @@ push:
|
|||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f src/*.o src/{jpeg,omx}/*.o vgcore.* $(PROG)
|
rm -f src/*.o src/{jpeg,omx}/*.o vgcore.* $(PROG)
|
||||||
|
rm -rf pkg src/ustreamer-* src/v*.tar.gz v*.tar.gz
|
||||||
|
|||||||
4
PKGBUILD
4
PKGBUILD
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
|
|
||||||
pkgname=ustreamer
|
pkgname=ustreamer
|
||||||
pkgver=0.1
|
pkgver=0.4
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Lightweight and fast MJPG-HTTP streamer"
|
pkgdesc="Lightweight and fast MJPG-HTTP streamer"
|
||||||
url="https://github.com/pi-kvm/ustreamer"
|
url="https://github.com/pi-kvm/ustreamer"
|
||||||
@@ -19,7 +19,7 @@ md5sums=(SKIP)
|
|||||||
build() {
|
build() {
|
||||||
cd $srcdir
|
cd $srcdir
|
||||||
rm -rf $pkgname-build
|
rm -rf $pkgname-build
|
||||||
cp -r pi-kvm-$pkgver/ustreamer $pkgname-build
|
cp -r ustreamer-$pkgver $pkgname-build
|
||||||
cd $pkgname-build
|
cd $pkgname-build
|
||||||
make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $MAKEFLAGS
|
make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $MAKEFLAGS
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,4 +21,4 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define VERSION "0.1"
|
#define VERSION "0.4"
|
||||||
|
|||||||
Reference in New Issue
Block a user