Upgrade to 220901-f493607

Yaml config file support in the rc.conf with
photoprism_defaultsyaml=""

upgrade go to 1.19

refactoring the makefile
This commit is contained in:
huoju
2022-09-11 01:08:24 -04:00
parent be98edec22
commit c0f0a678c7
6 changed files with 53 additions and 40 deletions

View File

@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= photoprism
DISTVERSION= g20220730
DISTVERSION= g20220901
CATEGORIES= www
MAINTAINER= huoju@devep.net
@@ -18,45 +18,56 @@ EXTRACT_DEPENDS= ${RUN_DEPENDS} \
bash:shells/bash \
git:devel/git \
gmake:devel/gmake \
go>=1.18.2:lang/go \
npm:www/npm-node18 \
wget:ftp/wget
BUILD_DEPENDS= ${EXTRACT_DEPENDS}
BUILD_DEPENDS= ${EXTRACT_DEPENDS}
USES= gmake python:3.6+,build
USES= gmake go:1.19,modules python:3.6+,build
USE_GITHUB= yes
GH_ACCOUNT= photoprism
GH_PROJECT= photoprism
GH_TAGNAME= 0e1222c8309c14c34443631954f29be4ef1f7f55
GH_TAGNAME= f493607b04884d29b7bb2482fc0025b2b63ee59b
USE_RC_SUBR= photoprism
PHOTOPRISM_DATA_DIR= /var/db/photoprism
SUB_LIST+= PHOTOPRISM_DATA_DIR=${PHOTOPRISM_DATA_DIR}
SUB_FILES+= pkg-install pkg-message
BUILD_OS!=uname -s
BUILD_DATE!=date -u +%y%m%d
BUILD_ARCH!=uname -m
post-extract:
@${REINPLACE_CMD} -e 's|sha1sum|shasum|g' ${WRKSRC}/scripts/download-facenet.sh
@${REINPLACE_CMD} -e 's|sha1sum|shasum|g' ${WRKSRC}/scripts/download-nasnet.sh
@${REINPLACE_CMD} -e 's|sha1sum|shasum|g' ${WRKSRC}/scripts/download-nsfw.sh
@${REINPLACE_CMD} -e 's| sudo npm install -g npm| cd frontend \&\& env NODE_ENV=production npm install -D webpack-cli|g' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|dep-js:|dep-js: dep-npm|g' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|build-js:|build-js: dep-js|g' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|all: dep build-js|all: dep-tensorflow build-js dep-go build-go |g' ${WRKSRC}/Makefile
@(cd ${WRKSRC} ; \
./scripts/download-facenet.sh ; \
./scripts/download-nasnet.sh ; \
./scripts/download-nsfw.sh ; \
)
pre-build:
@${REINPLACE_CMD} -e 's| go build -v ./...| CGO_LDFLAGS="-L/usr/local/lib" go build -v ./cmd/... ./internal/... ./pkg/...|g' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's| scripts/build.sh debug| CGO_LDFLAGS="-L/usr/local/lib" scripts/build.sh debug|g' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|BUILD_VERSION=.*|BUILD_VERSION=${GH_TAGNAME}|' ${WRKSRC}/scripts/build.sh
@${REINPLACE_CMD} -e 's|BUILD_VERSION ?=.*|BUILD_VERSION=${GH_TAGNAME}|' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|BUILD_ARCH=.*|BUILD_ARCH=$$(uname -m)|' ${WRKSRC}/scripts/build.sh
@${REINPLACE_CMD} -e 's|BUILD_ARCH ?=.*|BUILD_ARCH=$$(uname -m)|' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's|main.version=[^"]*|main.version=${DISTVERSION:C/^...//}-${GH_TAGNAME:C/([0-9a-f]{7}).*/\1/}-$${BUILD_OS}-$${BUILD_ARCH}-DEBUG-build-$${BUILD_DATE}|' ${WRKSRC}/scripts/build.sh
${MKDIR} ${WRKSRC}/build
${MKDIR} ${WRKSRC}/assets/static/build
@( cd ${WRKSRC}/frontend; \
npm install --yes -D webpack-cli ; \
)
do-build:
@( cd ${WRKSRC}/frontend; \
env NODE_ENV=production npm run build ; \
)
@( cd ${WRKSRC} ; \
${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build -v -ldflags \
"-X main.version=${DISTVERSION:C/^...//}-${GH_TAGNAME:C/([0-9a-f]{7}).*/\1/}-${BUILD_OS}-${BUILD_ARCH}-DEBUG-build-${BUILD_DATE}" \
-o ${WRKSRC}/photoprism ./cmd/photoprism/photoprism.go ; \
)
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/photoprism ${STAGEDIR}${PREFIX}/bin
${MKDIR} ${STAGEDIR}${PHOTOPRISM_DATA_DIR}

View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1660231161
SHA256 (photoprism-photoprism-g20220730-0e1222c8309c14c34443631954f29be4ef1f7f55_GH0.tar.gz) = d81be0a493f5eba3ad9b3b0388d23ecf9901293016bb4695bb951f822f54cd64
SIZE (photoprism-photoprism-g20220730-0e1222c8309c14c34443631954f29be4ef1f7f55_GH0.tar.gz) = 52472957
TIMESTAMP = 1662065216
SHA256 (photoprism-photoprism-g20220901-f493607b04884d29b7bb2482fc0025b2b63ee59b_GH0.tar.gz) = 5ef41165029d08b8ca538ff3dd16a7387b37d14f6a1250971aaa6520a27639ff
SIZE (photoprism-photoprism-g20220901-f493607b04884d29b7bb2482fc0025b2b63ee59b_GH0.tar.gz) = 53342730

View File

@@ -1,14 +0,0 @@
--- Makefile.orig 2022-06-04 15:19:27.618006000 -0400
+++ Makefile 2022-06-04 15:22:49.855792000 -0400
@@ -140,11 +140,6 @@
generate:
go generate ./pkg/... ./internal/...
go fmt ./pkg/... ./internal/...
- # revert unnecessary pot file change
- POT_UNCHANGED='1 file changed, 1 insertion(+), 1 deletion(-)'
- @if [ ${$(shell git diff --shortstat assets/locales/messages.pot):1:45} == $(POT_UNCHANGED) ]; then\
- git checkout -- assets/locales/messages.pot;\
- fi
clean-local-assets:
rm -rf $(BUILD_PATH)/assets/*
clean-local-cache:

View File

@@ -24,7 +24,7 @@ export PHOTOPRISM_AUTH_MODE=${photoprism_auth_mode}
pidfile="/var/run/photoprism.pid"
procname="/usr/local/bin/photoprism"
command="/usr/sbin/daemon"
command_args="-f -T photoprism -p ${pidfile} -u photoprism /usr/local/bin/photoprism --assets-path=${photoprism_assetspath} --storage-path=${photoprism_storagepath} --originals-path=${photoprism_storagepath}/originals --import-path=${photoprism_storagepath}/import ${photoprism_args} start"
command_args="-f -T photoprism -p ${pidfile} -u photoprism /usr/local/bin/photoprism --defaults-yaml=${photoprism_defaultsyaml} --assets-path=${photoprism_assetspath} --storage-path=${photoprism_storagepath} --originals-path=${photoprism_storagepath}/originals --import-path=${photoprism_storagepath}/import ${photoprism_args} start"
run_rc_command "$1"

View File

@@ -6,6 +6,10 @@ photoprism_enable="YES"
photoprism_assetspath="%%PHOTOPRISM_DATA_DIR%%/assets"
photoprism_storagepath="%%PHOTOPRISM_DATA_DIR%%/storage"
or add a yaml file for options, if you prefer:
photoprism_defaultsyaml="/usr/local/etc/photoprism/options.yml"
For enable the public mode (no password view):
photoprism_auth_mode="public"

View File

@@ -94,6 +94,8 @@ bin/photoprism
/var/db/photoprism/assets/locales/ar/default.po
/var/db/photoprism/assets/locales/bg/default.mo
/var/db/photoprism/assets/locales/bg/default.po
/var/db/photoprism/assets/locales/ca/default.mo
/var/db/photoprism/assets/locales/ca/default.po
/var/db/photoprism/assets/locales/cs/default.mo
/var/db/photoprism/assets/locales/cs/default.po
/var/db/photoprism/assets/locales/da/default.mo
@@ -106,6 +108,8 @@ bin/photoprism
/var/db/photoprism/assets/locales/en/default.po
/var/db/photoprism/assets/locales/es/default.mo
/var/db/photoprism/assets/locales/es/default.po
/var/db/photoprism/assets/locales/fi/default.mo
/var/db/photoprism/assets/locales/fi/default.po
/var/db/photoprism/assets/locales/fr/default.mo
/var/db/photoprism/assets/locales/fr/default.po
/var/db/photoprism/assets/locales/he/default.mo
@@ -147,12 +151,16 @@ bin/photoprism
/var/db/photoprism/assets/locales/ru/default.po
/var/db/photoprism/assets/locales/sk/default.mo
/var/db/photoprism/assets/locales/sk/default.po
/var/db/photoprism/assets/locales/sl/default.mo
/var/db/photoprism/assets/locales/sl/default.po
/var/db/photoprism/assets/locales/sv/default.mo
/var/db/photoprism/assets/locales/sv/default.po
/var/db/photoprism/assets/locales/th/default.mo
/var/db/photoprism/assets/locales/th/default.po
/var/db/photoprism/assets/locales/tr/default.mo
/var/db/photoprism/assets/locales/tr/default.po
/var/db/photoprism/assets/locales/uk/default.mo
/var/db/photoprism/assets/locales/uk/default.po
/var/db/photoprism/assets/locales/zh/default.mo
/var/db/photoprism/assets/locales/zh/default.po
/var/db/photoprism/assets/locales/zh_TW/default.mo
@@ -623,14 +631,14 @@ bin/photoprism
/var/db/photoprism/assets/static/build/2d8017489da689caedc1.woff2
/var/db/photoprism/assets/static/build/698bd8550d863c20a3e1.ttf
/var/db/photoprism/assets/static/build/af9a28e7f261a412f581.eot
/var/db/photoprism/assets/static/build/app.4039d06458394aac416a.js
/var/db/photoprism/assets/static/build/app.4039d06458394aac416a.js.LICENSE.txt
/var/db/photoprism/assets/static/build/app.971373925b83d1db786c.css
/var/db/photoprism/assets/static/build/app.8b96715ec332728e9a6e.js
/var/db/photoprism/assets/static/build/app.8b96715ec332728e9a6e.js.LICENSE.txt
/var/db/photoprism/assets/static/build/app.da5cb012461c81b32d73.css
/var/db/photoprism/assets/static/build/assets.json
/var/db/photoprism/assets/static/build/f64c3af3d0d25b9e4e00.svg
/var/db/photoprism/assets/static/build/share.971373925b83d1db786c.css
/var/db/photoprism/assets/static/build/share.de5c4bd79c6a1b65eab4.js
/var/db/photoprism/assets/static/build/share.de5c4bd79c6a1b65eab4.js.LICENSE.txt
/var/db/photoprism/assets/static/build/share.da5cb012461c81b32d73.css
/var/db/photoprism/assets/static/build/share.f40014f33c2633f5c5d2.js
/var/db/photoprism/assets/static/build/share.f40014f33c2633f5c5d2.js.LICENSE.txt
/var/db/photoprism/assets/static/build/sw.js
/var/db/photoprism/assets/static/font/Open Sans Bold/0-255.pbf
/var/db/photoprism/assets/static/font/Open Sans Bold/1024-1279.pbf
@@ -1866,12 +1874,14 @@ bin/photoprism
@dir /var/db/photoprism/assets/facenet
@dir /var/db/photoprism/assets/locales/ar
@dir /var/db/photoprism/assets/locales/bg
@dir /var/db/photoprism/assets/locales/ca
@dir /var/db/photoprism/assets/locales/cs
@dir /var/db/photoprism/assets/locales/da
@dir /var/db/photoprism/assets/locales/de
@dir /var/db/photoprism/assets/locales/el
@dir /var/db/photoprism/assets/locales/en
@dir /var/db/photoprism/assets/locales/es
@dir /var/db/photoprism/assets/locales/fi
@dir /var/db/photoprism/assets/locales/fr
@dir /var/db/photoprism/assets/locales/he
@dir /var/db/photoprism/assets/locales/hi
@@ -1892,9 +1902,11 @@ bin/photoprism
@dir /var/db/photoprism/assets/locales/ro
@dir /var/db/photoprism/assets/locales/ru
@dir /var/db/photoprism/assets/locales/sk
@dir /var/db/photoprism/assets/locales/sl
@dir /var/db/photoprism/assets/locales/sv
@dir /var/db/photoprism/assets/locales/th
@dir /var/db/photoprism/assets/locales/tr
@dir /var/db/photoprism/assets/locales/uk
@dir /var/db/photoprism/assets/locales/zh
@dir /var/db/photoprism/assets/locales/zh_TW
@dir /var/db/photoprism/assets/locales