[gentoo-commits] gentoo-x86 commit in dev-libs/zziplib/files: zziplib-0.13.52-python.patch zziplib-0.13.52-SDL-test.patch zziplib-0.13.52-sparc-aligned-access.patch

[gentoo-commits] gentoo-x86 commit in dev-libs/zziplib/files: zziplib-0.13.52-python.patch zziplib-0.13.52-SDL-test.patch zziplib-0.13.52-sparc-aligned-access.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    09/05/23 04:51:53

  Added:                zziplib-0.13.52-python.patch
                        zziplib-0.13.52-SDL-test.patch
                        zziplib-0.13.52-sparc-aligned-access.patch
  Log:
  version bump; clean old
  (Portage version: 2.1.6.11/cvs/Linux i686)

Revision  Changes    Path
1.1                  dev-libs/zziplib/files/zziplib-0.13.52-python.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/zziplib/files/zziplib-0.13.52-python.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/zziplib/files/zziplib-0.13.52-python.patch?rev=1.1&content-type=text/plain

Index: zziplib-0.13.52-python.patch
===================================================================
Make it find correct Python version bug

http://bugs.gentoo.org/174189

--- configure
+++ configure
@@ -21037,7 +21037,7 @@
 done
 test -n "$PERL" || PERL="echo no perl found for"
 
-for ac_prog in python2.2 python2.3 python
+for ac_prog in python
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2



1.1                  dev-libs/zziplib/files/zziplib-0.13.52-SDL-test.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/zziplib/files/zziplib-0.13.52-SDL-test.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/zziplib/files/zziplib-0.13.52-SDL-test.patch?rev=1.1&content-type=text/plain

Index: zziplib-0.13.52-SDL-test.patch
===================================================================
this test isnt even run automatically and the dependencies are all broken,
so just disable it and be done

--- SDL/Makefile.in
+++ SDL/Makefile.in
@@ -38,7 +38,7 @@
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-check_PROGRAMS = zzcatsdl$(EXEEXT)
+check_PROGRAMS =
 subdir = SDL
 DIST_COMMON = $(pkgconfig_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in



1.1                  dev-libs/zziplib/files/zziplib-0.13.52-sparc-aligned-access.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/zziplib/files/zziplib-0.13.52-sparc-aligned-access.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/zziplib/files/zziplib-0.13.52-sparc-aligned-access.patch?rev=1.1&content-type=text/plain

Index: zziplib-0.13.52-sparc-aligned-access.patch
===================================================================
This patch for zziplib (0.13.50) fixes a bus error on Linux/SPARC.

Since SPARC machines are big endian and zip files are stored in little endian,
zziplib needs to do byte swapping. On GNU/Linux this is usually done using
glibc's bswap_{16,32,64} functions but in this case calling one of these
functions triggers a bus error. This patch completes upstreams work to
implement ZZIP_HAVE_ALIGNED_ACCESS_REQUIRED for machines which required aligned
access.
After applying the patch zziplib needs to be compiled with
-DZZIP_HAVE_ALIGNED_ACCESS_REQUIRED

To reproduce it run (in the src dir):
	cd Linux_*_sparc64.d && ./bins/zzcat test/test/README
or
	make check

Problem found by: Ferris McCormick <fmccor@gentoo.org>
Patch written by: Friedrich Oslage <bluebird@gentoo.org>
	with advice from: Mike Frysinger <vapier@gentoo.org>

http://bugs.gentoo.org/239472

--- zzip/fetch.c
+++ zzip/fetch.c
@@ -17,7 +17,7 @@
 #include <zzip/fetch.h>
 
 #if defined ZZIP_WORDS_BIGENDIAN && \
-   defined bswap_16 && defined bswap_32 && defined bswap_64
+   defined bswap_16 && defined bswap_32 && defined bswap_64 && !defined(ZZIP_HAVE_ALIGNED_ACCESS_REQUIRED)
 # define __ZZIP_GET16(__p)                        bswap_16(*(uint16_t*)(__p))
 # define __ZZIP_GET32(__p)                        bswap_32(*(uint32_t*)(__p))
 # define __ZZIP_SET16(__p,__x) (*(uint16_t*)(__p) = bswap_16((uint16_t)(__x)))