From 2bbc21e65d79afe62af74a531254268e1f20df2a Mon Sep 17 00:00:00 2001 From: Julian Rother <julianr@fsmpi.rwth-aachen.de> Date: Mon, 13 Jun 2022 19:56:20 +0200 Subject: [PATCH] Update Makefile and CI script for Debian Bullseye --- .gitlab-ci.yml | 27 +++++++++++---------------- Makefile | 3 +++ 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c693597..4233217 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,21 +1,16 @@ buildtest: - image: debian:stretch + image: debian:bullseye stage: test script: - - apt update - - apt install -y wget - - 'echo "deb http://www.deb-multimedia.org stretch main non-free" >> /etc/apt/sources.list' - - wget https://www.deb-multimedia.org/pool/main/d/deb-multimedia-keyring/deb-multimedia-keyring_2016.8.1_all.deb - - dpkg -i deb-multimedia-keyring_2016.8.1_all.deb - - apt update - - uname -a - - apt install -y locales-all git build-essential make libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libxml2-dev libcurl4-openssl-dev - - make + - apt update + - apt install -y locales-all git build-essential make libavformat-dev libavcodec-dev libavfilter-dev libavutil-dev libxml2-dev libcurl4-openssl-dev + - make artifacts: paths: - - probe - - probe-raw - - remux thumbnail - - transcode - - publish_video - - simple_live_transcode + - probe + - probe-raw + - remux + - thumbnail + - transcode + - publish_video + - simple_live_transcode diff --git a/Makefile b/Makefile index 9c5766f..17e276c 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,9 @@ TARGETS = probe probe-raw remux thumbnail transcode publish_video simple_live_tr CFLAGS = -I /usr/include/libxml2 LDFLAGS= -lcurl -lavcodec -lavformat -lavfilter -lswscale -lavutil -lxml2 +.c: + $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) + all: ${TARGETS} probe: probe.c *.h util/*.c -- GitLab