Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6670ed0167 | |||
| 101c5b6de6 | |||
| f1ba3b32dc | |||
| 01e2e5376b | |||
| 2a749714e5 | |||
| 259860e998 | |||
| 7b9ab384f1 |
@@ -19,3 +19,6 @@ config.status
|
||||
margen
|
||||
*.tar.gz
|
||||
configure
|
||||
src/margen*
|
||||
*.pkg.tar.zst
|
||||
pkg
|
||||
@@ -1,4 +1,5 @@
|
||||
AUTOMAKE_OPTIONS = foreign subdir-objects -Wall
|
||||
bin_PROGRAMS = margen
|
||||
margen_SOURCES = src/main.c src/args.c src/bmp.c src/generator.c src/rand.c
|
||||
margen_CFLAGS = -Ofast -march=native -flto -funroll-loops -fprefetch-loop-arrays -fno-exceptions -fopenmp
|
||||
include_HEADERS = src/main.h src/args.h src/bmp.h src/generator.h src/rand.h src/config.h src/types.h
|
||||
@@ -31,6 +31,12 @@ release:
|
||||
./configure
|
||||
make distcheck
|
||||
|
||||
.PHONY: release-arch
|
||||
release-arch: clean
|
||||
mkdir -p build
|
||||
cp PKGBUILD build
|
||||
cd build && makepkg
|
||||
|
||||
.PHONY: gif
|
||||
gif: build
|
||||
mkdir -p tmp
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
pkgname=margen
|
||||
pkgver=1.2.3
|
||||
pkgrel=1
|
||||
pkgdesc="Generate a marble-like pattern bitmap image, blazing fast."
|
||||
arch=('i686' 'pentium4' 'x86_64' 'arm' 'armv7h' 'armv6h' 'aarch64' 'riscv64')
|
||||
url="https://github.com/klemek/margen"
|
||||
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/klemek/margen/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
|
||||
sha256sums=('6922843b9cd1bcbca1dc65ca2cac1e4bf590487e77a06e21969a3432dc74963b')
|
||||
srcdir=build
|
||||
|
||||
build() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/$pkgname-$pkgver"
|
||||
sudo make DESTDIR="$pkgdir" install
|
||||
}
|
||||
@@ -14,7 +14,7 @@ Written in pure C without librairies.
|
||||
|
||||
See [Releases](https://github.com/klemek/margen/releases)
|
||||
|
||||
```bash
|
||||
```sh
|
||||
tar xvzf margen-x.y.z.tar.gz
|
||||
cd margen-x.y.z
|
||||
./configure
|
||||
@@ -22,9 +22,18 @@ make
|
||||
make install
|
||||
```
|
||||
|
||||
### From repository (PKGBUILD)
|
||||
|
||||
```sh
|
||||
git clone https://github.com/klemek/margen
|
||||
cd margen
|
||||
makepkg -si
|
||||
```
|
||||
|
||||
|
||||
### From repository (dev version)
|
||||
|
||||
```bash
|
||||
```sh
|
||||
git clone https://github.com/klemek/margen
|
||||
cd margen
|
||||
aclocal
|
||||
@@ -48,7 +57,7 @@ options:
|
||||
-w, --width image width (default: 1920)
|
||||
-h, --height image height (default: 1080)
|
||||
-o, --output output file (default: output.bmp)
|
||||
-seed random seed (default: time based)
|
||||
--seed random seed (default: time based)
|
||||
-p, --pixel pixel size (default: random)
|
||||
-s, --slope slope [0-255] (default: random)
|
||||
-c, --color base color [0-255,0-255,0-255] (default: random)
|
||||
@@ -57,3 +66,22 @@ options:
|
||||
-r, --rotation start corner rotation [0-3] (default: random)
|
||||
-m, --monochrome grayscale generation
|
||||
```
|
||||
|
||||
## Release guide
|
||||
|
||||
```bash
|
||||
# update configure.ac with new version
|
||||
$EDITOR configure.ac
|
||||
# make full build
|
||||
make -f Makefile.dev release
|
||||
# push to repo
|
||||
git commit -am "margen vX.Y.Z"
|
||||
git tag vX.Y.Z
|
||||
git push origin master --tags
|
||||
# create release from tag on github
|
||||
# update PKGBUILD with new sha256 sum
|
||||
sha256sum margen-x.y.z.tar.gz
|
||||
make -f Makefile.dev release-arch
|
||||
git commit -am "update arch sha256"
|
||||
# add .pkg.tar.zst on the release
|
||||
```
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
AC_INIT([margen], [1.2.1], [klemek.dev@proton.me])
|
||||
AC_INIT([margen], [1.2.3], [klemek.dev@proton.me])
|
||||
AM_INIT_AUTOMAKE
|
||||
AC_PROG_CC
|
||||
AC_CHECK_HEADERS([stdio.h])
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 7.6 MiB After Width: | Height: | Size: 8.1 MiB |
+2
-2
@@ -32,7 +32,7 @@ void print_help(int status_code) {
|
||||
" -w, --width image width (default: 1920)\n"
|
||||
" -h, --height image height (default: 1080)\n"
|
||||
" -o, --output output file (default: output.bmp)\n"
|
||||
" -seed random seed (default: time based)\n"
|
||||
" --seed random seed (default: time based)\n"
|
||||
" -p, --pixel pixel size (default: random)\n"
|
||||
" -s, --slope slope [0-255] (default: random)\n"
|
||||
" -c, --color base color [0-255,0-255,0-255] (default: random)\n"
|
||||
@@ -99,7 +99,7 @@ unsigned short parse_ushort(char *arg, char *value) {
|
||||
return (unsigned short)tmp_value;
|
||||
}
|
||||
|
||||
unsigned short parse_ulong(char *arg, char *value) {
|
||||
unsigned long parse_ulong(char *arg, char *value) {
|
||||
if (!is_number(value)) {
|
||||
invalid_value(arg, value);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user