[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r7798: xaos and config
|
From: |
Carl Hansen |
|
Subject: |
[Gsrc-commit] trunk r7798: xaos and config |
|
Date: |
Sun, 12 Sep 2021 21:50:53 -0400 (EDT) |
|
User-agent: |
Bazaar (2.7.0dev1) |
------------------------------------------------------------
revno: 7798
revision-id: carlhansen1234@gmail.com-20210913015046-3jejfu9kpu7xymk0
parent: carlhansen1234@gmail.com-20210912200038-tmtiht3i3y2pny80
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Sun 2021-09-12 18:50:46 -0700
message:
xaos and config
removed:
pkg/gnu/xaos/files/ files-20160617014725-uokjfnggs70iry9h-2014
pkg/gnu/xaos/files/xaos-3.5-libpng15.diff
xaos3.5libpng15.diff-20160617014725-uokjfnggs70iry9h-2245
pkg/gnu/xaos/files/xaos-3.6-unprotected-locales.diff
xaos3.6unprotectedlo-20160617014725-uokjfnggs70iry9h-2246
modified:
pkg/gnu/config/Makefile makefile-20170430231231-0lbw966hs16oxlmd-2
pkg/gnu/xaos/Makefile makefile-20160617014725-uokjfnggs70iry9h-2010
pkg/gnu/xaos/sha256sums sha256sums-20160617014725-uokjfnggs70iry9h-2015
=== modified file 'pkg/gnu/config/Makefile'
--- a/pkg/gnu/config/Makefile 2021-07-23 22:37:24 +0000
+++ b/pkg/gnu/config/Makefile 2021-09-13 01:50:46 +0000
@@ -77,8 +77,7 @@
$(MAKECOOKIE)
pre-install-my:
- mkdir -p $(prefix)/packages/$(GARNAME)-$(GARVERSION)
- touch $(prefix)/packages/$(GARNAME)-$(GARVERSION)/foo
+ mkdir -p $(prefix)/packages/$(GARNAME)-$(GARVERSION)/bin
@echo INSTALL_BIN $(WORKDIR)/config/config.guess and config.sub
$(INSTALL_BIN) $(WORKDIR)/config/config.guess
$(INSTALL_BIN) $(WORKDIR)/config/config.sub
=== modified file 'pkg/gnu/xaos/Makefile'
--- a/pkg/gnu/xaos/Makefile 2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/xaos/Makefile 2021-09-13 01:50:46 +0000
@@ -1,6 +1,8 @@
# Copyright © 2013, 2014 Brandon Invergo <brandon@invergo.net>
+# Copyright © 2021 Carl Hansen <carlhansen@gnu.org>
#
-# This file is part of GSRC.
+# This file is part of GSRC, the GNU Source Release Collection.
+# http://www.gnu.org/software/gsrc
#
# GSRC is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -14,10 +16,13 @@
#
# You should have received a copy of the GNU General Public License
# along with GSRC. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Send bug reports and comments about GSRC problems to bug-gsrc@gnu.org
NAME = XaoS
GARNAME = xaos
-GARVERSION = 3.6
+GARVERSION = 4.2.1
HOME_URL = http://www.gnu.org/software/xaos/
DESCRIPTION = Real-time fractal zoomer
define BLURB
@@ -29,22 +34,53 @@
endef
######################################################################
-
-MASTER_SITES = $(MASTER_SOURCEFORGE)
-MASTER_SUBDIR = $(GARNAME)/files/XaoS/$(GARVERSION)/
-DISTFILES = $(DISTNAME).tar.gz
+#https://github.com/xaos-project/XaoS/archive/refs/tags/release-4.2.1.tar.gz
+MASTER_SITES = $(MASTER_GITHUB)
+MASTER_SUBDIR = $(GARNAME)-project/XaoS/archive/refs/tags/
+DISTFILES = release-$(GARVERSION).tar.gz
SIGFILES =
-PATCHFILES = $(DISTNAME)-unprotected-locales.diff
-INFO_FILES = $(GARNAME).info
BUILDDEPS =
-#LIBDEPS = gsl libpng gtk gettext
LIBDEPS =
-
+CONFIGURE_SCRIPTS =
+
+WORKSRC = $(WORKDIR)/XaoS-release-$(GARVERSION)
+
+# HINT: needs qmake from qt
######################################################################
include ../../../gar/gar.lib/auto.mk
-include ../../../gar/gar.lib/info.mk
+#include ../../../gar/gar.lib/info.mk
include config.mk
-CONFIGURE_ARGS += --with-gsl --with-gtk-driver
+.PHONY: pre-build custom-pre-install
+
+pre-build: fetch
+ cd $(WORKSRC) && qmake
+
+# see gp2c
+custom-pre-install:
+ @echo dotgardir = $(prefix)/.gar/$(strip $(GARNAME))$(if
$(GARPROFILE),-$(strip $(GARPROFILE)))
+ @echo PACKAGENAME $(PACKAGENAME) $(DISTNAME)
+ @echo packagedir = $(packagesdir)/$(PACKAGENAME)
prefix.pacakges.DISTNAME = $(prefix)/packages/$(DISTNAME)
+ @echo packageDESTDIR = $(packagesdir)/$(PACKAGENAME)-DEST
+ @echo packageprefix = $(packageDESTDIR)$(prefix)
+ @echo packageprefix = $(packageprefix)
+ @echo packagedotgardir = $(packageDESTDIR)$(dotgardir)
+ @echo packagesysconfdir = $(packageDESTDIR)$(sysconfdir)
+ @echo packagevardir = $(packageDESTDIR)$(vardir)
+ @echo packagedocs = $(packageprefix)/share/doc/$(strip
$(GARNAME))
+ @echo packageexamples = $(packageprefix)/share/examples/$(strip
$(GARNAME))
+ mkdir -p $(packagedir)/bin
+ mkdir -p $(packageprefix)/bin
+ mkdir -p $(packageprefix)/share/man/man6
+ mkdir -p $(packageprefix)/share/xaos
+ mkdir -p $(packagedocs)
+ mkdir -p $(packageexamples)
+ cd $(WORKSRC) && cp -a ./doc/* $(packagedocs)
+ cd $(WORKSRC) && cp ./bin/xaos $(packageprefix)/bin/
+ cd $(WORKSRC) && cp ./doc/xaos.6 $(packageprefix)/share/man/man6/
+ cd $(WORKSRC) && cp -a ./examples $(packageexamples)
+
+
+
=== removed directory 'pkg/gnu/xaos/files'
=== removed file 'pkg/gnu/xaos/files/xaos-3.5-libpng15.diff'
--- a/pkg/gnu/xaos/files/xaos-3.5-libpng15.diff 2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/xaos/files/xaos-3.5-libpng15.diff 1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-http://code.google.com/p/gnuxaos/issues/detail?id=55
-
---- work/xaos-3.5/src/util/png.c
-+++ work/xaos-3.5/src/util/png.c
-@@ -3,6 +3,7 @@
- #include <aconfig.h>
- #ifdef USE_PNG
- #include <png.h>
-+#include <zlib.h>
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-@@ -31,6 +32,9 @@
- png_structp png_ptr;
- png_infop info_ptr;
- png_color palette[256];
-+ png_color_8 sig_bit;
-+ int color_type;
-+ int bit_depth;
- volatile unsigned short a = 255;
- volatile unsigned char *b = (volatile unsigned char *) &a;
- #ifdef _undefined_
-@@ -59,7 +63,7 @@
- png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- return "No memory to create png info structure";
- }
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_write_struct(&png_ptr, &info_ptr);
- fclose(file);
- return strerror(errno);
-@@ -78,57 +82,70 @@
- png_set_compression_window_bits(png_ptr, 15);
- png_set_compression_method(png_ptr, 8);
-
-- info_ptr->width = image->width;
-- info_ptr->height = image->height;
-- /*info_ptr->gamma=1.0; */
-- info_ptr->gamma = 0.5;
-- info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs;
-- info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth);
-- info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight);
-+ switch (image->palette->type)
-+ {
-+ case C256:
-+ color_type = PNG_COLOR_TYPE_PALETTE;
-+ bit_depth = image->bytesperpixel * 8;
-+ break;
-+ case SMALLITER:
-+ case LARGEITER:
-+ case GRAYSCALE:
-+ color_type = PNG_COLOR_TYPE_GRAY;
-+ bit_depth = image->bytesperpixel * 8;
-+ break;
-+ case TRUECOLOR:
-+ case TRUECOLOR24:
-+ case TRUECOLOR16:
-+ color_type = PNG_COLOR_TYPE_RGB;
-+ bit_depth = 8;
-+ break;
-+ }
-
-+ png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth,
-+ color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
-+ PNG_FILTER_TYPE_BASE);
-
- switch (image->palette->type) {
- case C256:
- {
- int i;
-- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-- info_ptr->bit_depth = image->bytesperpixel * 8;
-- info_ptr->palette = palette;
-- info_ptr->valid |= PNG_INFO_PLTE;
-+ png_color png_palette[257];
-+ int png_num_palette;
- for (i = 0; i < image->palette->end; i++)
-- info_ptr->palette[i].red = image->palette->rgb[i][0],
-- info_ptr->palette[i].green = image->palette->rgb[i][1],
-- info_ptr->palette[i].blue = image->palette->rgb[i][2],
-- info_ptr->num_palette = image->palette->end;
-+ png_palette[i].red = image->palette->rgb[i][0],
-+ png_palette[i].green = image->palette->rgb[i][1],
-+ png_palette[i].blue = image->palette->rgb[i][2],
-+ png_num_palette = image->palette->end;
-+ png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette);
- }
- break;
-- case SMALLITER:
-- case LARGEITER:
-- case GRAYSCALE:
-- info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
-- info_ptr->bit_depth = image->bytesperpixel * 8;
-- break;
- case TRUECOLOR:
- case TRUECOLOR24:
- case TRUECOLOR16:
-- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-- info_ptr->bit_depth = 8;
-- info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec;
-- info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec;
-- info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec;
-+ sig_bit.red = 8 - image->palette->info.truec.rprec;
-+ sig_bit.green = 8 - image->palette->info.truec.gprec;
-+ sig_bit.blue = 8 - image->palette->info.truec.bprec;
-+ png_set_sBIT(png_ptr, info_ptr, &sig_bit);
- break;
- }
-- info_ptr->interlace_type = 0;
-+
-+ png_write_info (png_ptr, info_ptr);
-+
- #ifdef _undefined_
- png_set_text(png_ptr, info_ptr, comments,
- sizeof(comments) / sizeof(png_text));
- #endif
-
-- png_write_info(png_ptr, info_ptr);
-+ png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */);
-+ png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth),
-+ (png_uint_32) (100 / image->pixelheight),
-+ PNG_RESOLUTION_UNKNOWN);
-+
- /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */
- png_set_packing(png_ptr);
- if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16))
-- png_set_shift(png_ptr, &(info_ptr->sig_bit));
-+ png_set_shift (png_ptr, &sig_bit);
- if (*b == 255)
- png_set_swap(png_ptr);
- png_set_bgr(png_ptr);
=== removed file 'pkg/gnu/xaos/files/xaos-3.6-unprotected-locales.diff'
--- a/pkg/gnu/xaos/files/xaos-3.6-unprotected-locales.diff 2016-06-17
19:08:15 +0000
+++ b/pkg/gnu/xaos/files/xaos-3.6-unprotected-locales.diff 1970-01-01
00:00:00 +0000
@@ -1,33 +0,0 @@
-This patch removes protection from locale files installed by XaoS, since their
-protection interferes with the normal operation of GSRC. If you're installing
-XaoS system-wide using GSRC and you have root priveleges, you can disable this
-patch.
-
-diff -x config.log -x config.status -ru tmp/xaos-3.5/src/i18n/Makefile.in.in
work/xaos-3.5/src/i18n/Makefile.in.in
---- work/xaos-3.5/src/i18n/Makefile.in.in 2009-07-18 01:50:28.000000000
+0200
-+++ work/xaos-3.5/src/i18n/Makefile.in.in 2013-01-15 23:49:47.827560898
+0100
-@@ -2,7 +2,7 @@
- LANGUAGES=$(PO-FILES:.po=)
-
- # Maybe this should be autogenerated by "configure".
--LOCALEDIR=@LOCALEDIR@
-+LOCALEDIR=$(prefix)/share/locale
-
- # If other files will be translated, they must be also here:
- CSOURCES=../ui/ui.c ../ui-hlp/menu.c \
-@@ -21,13 +21,13 @@
- install: $(MO-FILES)
- @for i in $(LANGUAGES); do \
- @INSTALL@ -d $(DESTDIR)$(LOCALEDIR)/$$i/LC_MESSAGES; \
-- @INSTALL@ -m 444 $$i.mo
$(DESTDIR)$(LOCALEDIR)/$$i/LC_MESSAGES/xaos.mo; \
-+ @INSTALL@ -m 666 $$i.mo
$(DESTDIR)$(LOCALEDIR)/$$i/LC_MESSAGES/xaos.mo; \
- done
-
- install-win: $(MO-FILES)
- @for i in $(LANGUAGES); do \
- @INSTALL@ -d $(DESTDIR)/locale/$$i/LC_MESSAGES; \
-- @INSTALL@ -m 444 $$i.mo $(DESTDIR)/locale/$$i/LC_MESSAGES/xaos.mo; \
-+ @INSTALL@ -m 666 $$i.mo $(DESTDIR)/locale/$$i/LC_MESSAGES/xaos.mo; \
- done
-
- clean:
=== modified file 'pkg/gnu/xaos/sha256sums'
--- a/pkg/gnu/xaos/sha256sums 2016-06-17 19:08:15 +0000
+++ b/pkg/gnu/xaos/sha256sums 2021-09-13 01:50:46 +0000
@@ -1,2 +1,1 @@
-989f3e38f7793810cbb1496d5291d44836a7d7c058422b9ee1cffb163a0b8d95
download/xaos-3.6.tar.gz
-5a8e5952048f30833394e27a9b433173c414ecf42e93b459600abaa262b6275e
download/xaos-3.6-unprotected-locales.diff
+bf21d3f50d7c1626c5c96da475f84ea24d24a164ec6cc2bbc4ee229bc4a65967
download/release-4.2.1.tar.gz
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r7798: xaos and config,
Carl Hansen <=