Skip to content

B
branding-etersoft-ximper
Verified Commit 3db88849 authored by Kirill Unitsaev's avatar Kirill Unitsaev
Browse files
Options

build: replace convert with magick

parent 273cfb70
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
Makefile.in
View file @ 3db88849
...@@ -22,14 +22,14 @@ graphics: ...@@ -22,14 +22,14 @@ graphics:
cp -al images/wallpaper.png backgrounds/default.png cp -al images/wallpaper.png backgrounds/default.png
cp -al images/wallpaper.png backgrounds/xdm.png cp -al images/wallpaper.png backgrounds/xdm.png
# make wallpapers for grub2 # make wallpapers for grub2
# convert images/background4x3.png -resize 800x600 images/small.png # magick images/background4x3.png -resize 800x600 images/small.png
# display status # display status
# convert images/small.png images/product-logo.png -geometry +30+30 -composite images/grub.png # magick images/small.png images/product-logo.png -geometry +30+30 -composite images/grub.png
# cp -al images/grub.png images/boot.png # cp -al images/grub.png images/boot.png
# use predefined image 800x600 with logo # use predefined image 800x600 with logo
if [ -n "$(STATUS)" ];then \ if [ -n "$(STATUS)" ];then \
mv images/boot.png images/.boot.png; \ mv images/boot.png images/.boot.png; \
convert images/.boot.png -undercolor '#c62530' -fill white -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 30 -gravity NorthEast -draw 'text 0,55 " $(STATUS) "' images/boot.png;\ magick images/.boot.png -undercolor '#c62530' -fill white -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 30 -gravity NorthEast -draw 'text 0,55 " $(STATUS) "' images/boot.png;\
rm -f images/.boot.png; \ rm -f images/.boot.png; \
fi fi
# product logo for ahttpd # product logo for ahttpd
...@@ -41,7 +41,7 @@ graphics: ...@@ -41,7 +41,7 @@ graphics:
browser-qt/design/bg.png: images/installer.png browser-qt/design/bg.png: images/installer.png
if [ -n "$(STATUS)" ];then \ if [ -n "$(STATUS)" ];then \
convert $< -undercolor '#c62530' -fill white -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 30 -gravity northwest -draw 'text 0,0 " $(STATUS) "' $@; \ magick $< -undercolor '#c62530' -fill white -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 30 -gravity northwest -draw 'text 0,0 " $(STATUS) "' $@; \
else \ else \
cp -a $< $@; \ cp -a $< $@; \
fi fi
...@@ -59,7 +59,7 @@ browser-qt:browser-qt/design/bg.png ...@@ -59,7 +59,7 @@ browser-qt:browser-qt/design/bg.png
ahttpd: ahttpd:
for i in ahttpd/images/*.svg; do \ for i in ahttpd/images/*.svg; do \
image=$${i%.svg}; \ image=$${i%.svg}; \
convert -background none $$image.svg $$image.png ; \ magick -background none $$image.svg $$image.png ; \
done done
install -d $(datadir)/alterator/design/styles install -d $(datadir)/alterator/design/styles
cp -a ahttpd/images $(datadir)/alterator/design cp -a ahttpd/images $(datadir)/alterator/design
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment