[pkg-remote-commits] [nx-libs] 03/08: debian/patches: Drop 0001_fix-ftbfs-on-hppa.patch, 0007_fix-ftbfs-on-mips64el.patch. Support for mips64el and hppa has been added by upstream.
Mike Gabriel
sunweaver at debian.org
Fri Jun 30 21:28:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
sunweaver pushed a commit to branch master
in repository nx-libs.
commit 2e005741b963665e686247c725d5c49f57ec2f20
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jun 30 21:41:03 2017 +0200
debian/patches: Drop 0001_fix-ftbfs-on-hppa.patch, 0007_fix-ftbfs-on-mips64el.patch. Support for mips64el and hppa has been added by upstream.
---
debian/patches/0001_fix-ftbfs-on-hppa.patch | 435 ------------------------
debian/patches/0007_fix-ftbfs-on-mips64el.patch | 48 ---
debian/patches/series | 2 -
3 files changed, 485 deletions(-)
diff --git a/debian/patches/0001_fix-ftbfs-on-hppa.patch b/debian/patches/0001_fix-ftbfs-on-hppa.patch
deleted file mode 100644
index d6582fe..0000000
--- a/debian/patches/0001_fix-ftbfs-on-hppa.patch
+++ /dev/null
@@ -1,435 +0,0 @@
-commit 6320f6d2ead54577b53a0972623a2c0d6bb9cc03
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Date: Sat May 6 00:38:01 2017 +0200
-
- Fix FTBFS on Linux based HP-PARisc 32-bit systems. Thanks to John Paul Adrian Glaubitz from FU Berlin for providing access to a corresponding porters' machine.
-
-
-commit 9829913a9e91b91ddeeaaa3b5c74f10c347ef96d
-Author: Adam Jackson <ajax at redhat.com>
-Date: Sat May 6 00:29:46 2017 +0200
-
- dix: Remove arch awareness from servermd.h (v2)
-
- commit 1af15aaf278edcf6f6de94774350e34a80883c24
- Author: Olivier Fourdan <ofourdan at redhat.com>
- Date: Fri Apr 10 10:07:38 2015 +0200
-
- dix: Fix image byte order on big endian hardware
-
- Make sure X_BIG_ENDIAN/X_LITTLE_ENDIAN are defined before actually using
- them.
-
- Otherwise, image byte order could be wrong on big endian hardware even
- though endianess detection is correct.
-
- Reported-by: Tim Waugh <twaugh at redhat.com>
- Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
- Reviewed-by: Adam Jackson <ajax at redhat.com>
-
- commit 4302484ef2e67b2e05756c7ee0834dce938f1b44
- Author: Adam Jackson <ajax at redhat.com>
- Date: Mon Jul 21 10:06:53 2014 -0400
-
- dix: Remove arch awareness from servermd.h (v2)
-
- At this point we have no architectures where image byte order is
- different from bitmap bit order, or where either of those two are not
- also the native word endianness. Hooray, one more place where we don't
- have to worry about enabling new CPU architectures.
-
- v2: Rebase to master to handle the addition of ppc64le, arc, and xtensa,
- and use autoconf's endianness detection instead of gcc predefines.
-
- Signed-off-by: Adam Jackson <ajax at redhat.com>
- Reviewed-by: Daniel Stone <daniels at collabora.com>
- Signed-off-by: Keith Packard <keithp at keithp.com>
-
- Backported-to-NX-by: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-
-diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf
-index 32f3e321..1fda4b25 100644
---- a/nx-X11/config/cf/Imake.cf
-+++ b/nx-X11/config/cf/Imake.cf
-@@ -841,6 +841,12 @@ XCOMM Keep cpp from replacing path elements containing i486/i586/i686
- # define Mc68020Architecture
- # undef mc68000
- # endif /* mc68000 */
-+# ifdef __hppa__
-+# define HPPARiscArchitecture
-+# undef __hppa__
-+# undef __hppa
-+# undef hppa
-+# endif
- # if defined (powerpc) && !defined(__powerpc64__) && !defined (powerpc64)
- # define PpcArchitecture
- # undef powerpc
-diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
-index 9deeb302..5c9aca05 100644
---- a/nx-X11/config/cf/Imake.tmpl
-+++ b/nx-X11/config/cf/Imake.tmpl
-@@ -499,6 +499,8 @@ XCOMM the platform-specific parameters - edit site.def to change
- #define ByteOrder X_BIG_ENDIAN
- #elif defined(AlphaArchitecture)
- #define ByteOrder X_LITTLE_ENDIAN
-+#elif defined(HPPARiscArchitecture)
-+#define ByteOrder X_BIG_ENDIAN
- #elif defined(Mc68000Architecture)
- #define ByteOrder X_BIG_ENDIAN
- #elif defined(Mc68020Architecture)
-diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
-index 9a3e3ceb..71dd357d 100644
---- a/nx-X11/config/cf/linux.cf
-+++ b/nx-X11/config/cf/linux.cf
-@@ -677,6 +677,15 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion)
- # endif
- #endif /* AlphaArchitecture */
-
-+#ifdef HPPARiscArchitecture
-+# ifndef OptimizedCDebugFlags
-+# define OptimizedCDebugFlags -O2 GccAliasingArgs
-+# endif
-+# define LinuxMachineDefines -D__hppa__
-+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-+#endif /* HPPARiscArchitecture */
-+
- #ifdef Arm32Architecture
- # define DefaultCCOptions
- # ifndef OptimizedCDebugFlags
-diff --git a/nx-X11/extras/Mesa.patches/4002_define-USE_IEEE-macro-for-more-platforms.patch b/nx-X11/extras/Mesa.patches/4002_define-USE_IEEE-macro-for-more-platforms.patch
-index 7db909b9..0a512e6b 100644
---- a/nx-X11/extras/Mesa.patches/4002_define-USE_IEEE-macro-for-more-platforms.patch
-+++ b/nx-X11/extras/Mesa.patches/4002_define-USE_IEEE-macro-for-more-platforms.patch
-@@ -5,12 +5,13 @@ Index: Mesa/src/mesa/main/imports.h
- ===================================================================
- --- Mesa.orig/src/mesa/main/imports.h
- +++ Mesa/src/mesa/main/imports.h
--@@ -204,6 +204,8 @@ typedef union { GLfloat f; GLint i; } fi
-+@@ -204,6 +204,9 @@ typedef union { GLfloat f; GLint i; } fi
- defined(ia64) || defined(__ia64__) || \
- defined(__mips) || defined(_MIPS_ARCH) || \
- defined(__arm__) || \
- + defined(__aarch64__) || \
- + defined(__mc68000__) || \
-++ defined(__hppa__) || \
- defined(__sh__) || \
- (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS)))
- #define USE_IEEE
-diff --git a/nx-X11/programs/Xserver/include/servermd.h b/nx-X11/programs/Xserver/include/servermd.h
-index 04cd97bb..0156b99d 100644
---- a/nx-X11/programs/Xserver/include/servermd.h
-+++ b/nx-X11/programs/Xserver/include/servermd.h
-@@ -48,308 +48,19 @@ SOFTWARE.
- #ifndef SERVERMD_H
- #define SERVERMD_H 1
-
--/*
-- * Note: much of this is vestigial from mfb/cfb times. This should
-- * really be simplified even further.
-- */
--
--/*
-- * Machine dependent values:
-- * GLYPHPADBYTES should be chosen with consideration for the space-time
-- * trade-off. Padding to 0 bytes means that there is no wasted space
-- * in the font bitmaps (both on disk and in memory), but that access of
-- * the bitmaps will cause odd-address memory references. Padding to
-- * 2 bytes would ensure even address memory references and would
-- * be suitable for a 68010-class machine, but at the expense of wasted
-- * space in the font bitmaps. Padding to 4 bytes would be good
-- * for real 32 bit machines, etc. Be sure that you tell the font
-- * compiler what kind of padding you want because its defines are
-- * kept separate from this. See server/include/font.h for how
-- * GLYPHPADBYTES is used.
-- *
-- */
--
--#ifdef vax
--
--#define IMAGE_BYTE_ORDER LSBFirst /* Values for the VAX only */
--#define BITMAP_BIT_ORDER LSBFirst
--#define GLYPHPADBYTES 1
--
--#endif /* vax */
--
--#ifdef __arm32__
--
--#define IMAGE_BYTE_ORDER LSBFirst
--
--# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
--# define BITMAP_BIT_ORDER MSBFirst
--# else
--# define BITMAP_BIT_ORDER LSBFirst
--# endif
--
--# if defined(XF86MONOVGA) || defined(XF86VGA16)
--# define BITMAP_SCANLINE_UNIT 8
--# endif
--
--#define GLYPHPADBYTES 4
--
--#endif /* __arm32__ */
--
--#ifdef __aarch64__
--
--#ifdef __AARCH64EL__
--#define IMAGE_BYTE_ORDER LSBFirst
--#define BITMAP_BIT_ORDER LSBFirst
--#endif
--#ifdef __AARCH64EB__
--#define IMAGE_BYTE_ORDER MSBFirst
--#define BITMAP_BIT_ORDER MSBFirst
--#endif
--
--# if defined(XF86MONOVGA) || defined(XF86VGA16)
--# define BITMAP_SCANLINE_UNIT 8
--# endif
--
--#define GLYPHPADBYTES 4
--
--#endif /* __aarch64__ */
--
--#if defined(__powerpc__) || defined(__ppc__)
--
--#define IMAGE_BYTE_ORDER MSBFirst
--#define BITMAP_BIT_ORDER MSBFirst
--#define GLYPHPADBYTES 4
--
--#endif /* PowerPC */
--
--#if defined(__sh__)
-+#include <nx-X11/Xarch.h> /* for X_LITTLE_ENDIAN/X_BIG_ENDIAN */
-
--#if defined(__BIG_ENDIAN__)
--# define IMAGE_BYTE_ORDER MSBFirst
--# define BITMAP_BIT_ORDER MSBFirst
--# define GLYPHPADBYTES 4
--#else
-+#if X_BYTE_ORDER == X_LITTLE_ENDIAN
- # define IMAGE_BYTE_ORDER LSBFirst
- # define BITMAP_BIT_ORDER LSBFirst
--# define GLYPHPADBYTES 4
--#endif
--
--#endif /* SuperH */
--
--
--#if (defined(sun) && (defined(__sparc) || defined(sparc))) || \
-- (defined(__uxp__) && (defined(sparc) || defined(mc68000))) || \
-- defined(__sparc__) || defined(__mc68000__)
--
--#if defined(__sparc) || defined(__sparc__)
--# if !defined(sparc)
--# define sparc 1
--# endif
--#endif
--
--#if defined(sun386) || defined(sun5)
--# define IMAGE_BYTE_ORDER LSBFirst /* Values for the SUN only */
--# define BITMAP_BIT_ORDER LSBFirst
--#else
--# define IMAGE_BYTE_ORDER MSBFirst /* Values for the SUN only */
--# define BITMAP_BIT_ORDER MSBFirst
--#endif
--
--#define GLYPHPADBYTES 4
--
--#endif /* sun && !(i386 && SVR4) */
--
--#if defined(ibm032) || defined (ibm)
--
--#ifdef i386
--# define IMAGE_BYTE_ORDER LSBFirst /* Value for PS/2 only */
--#else
--# define IMAGE_BYTE_ORDER MSBFirst /* Values for the RT only*/
--#endif
--#define BITMAP_BIT_ORDER MSBFirst
--#define GLYPHPADBYTES 1
--/* ibm pcc doesn't understand pragmas. */
--
--#ifdef i386
--#define BITMAP_SCANLINE_UNIT 8
--#endif
--
--#endif /* ibm */
--
--#if defined (M4310) || defined(M4315) || defined(M4317) || defined(M4319) || defined(M4330)
--
--#define IMAGE_BYTE_ORDER MSBFirst /* Values for Pegasus only */
--#define BITMAP_BIT_ORDER MSBFirst
--#define GLYPHPADBYTES 4
--
--#endif /* tektronix */
--
--#ifdef macII
--
--#define IMAGE_BYTE_ORDER MSBFirst /* Values for the MacII only */
--#define BITMAP_BIT_ORDER MSBFirst
--#define GLYPHPADBYTES 4
--
--#endif /* macII */
--
--#if (defined(mips) || defined(__mips))
--
--#if defined(MIPSEL) || defined(__MIPSEL__)
--# define IMAGE_BYTE_ORDER LSBFirst /* Values for the PMAX only */
--# define BITMAP_BIT_ORDER LSBFirst
--# define GLYPHPADBYTES 4
--#else
--# define IMAGE_BYTE_ORDER MSBFirst /* Values for the MIPS only */
-+#elif X_BYTE_ORDER == X_BIG_ENDIAN
-+# define IMAGE_BYTE_ORDER MSBFirst
- # define BITMAP_BIT_ORDER MSBFirst
--# define GLYPHPADBYTES 4
--#endif
--
--#endif /* mips */
--
--#if defined(__alpha) || defined(__alpha__) || defined(__alphaCross)
--# define IMAGE_BYTE_ORDER LSBFirst /* Values for the Alpha only */
--
--# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
--# define BITMAP_BIT_ORDER MSBFirst
--# else
--# define BITMAP_BIT_ORDER LSBFirst
--# endif
--
--# if defined(XF86MONOVGA) || defined(XF86VGA16)
--# define BITMAP_SCANLINE_UNIT 8
--# endif
--
--# define GLYPHPADBYTES 4
--
--#endif /* alpha */
--
--#if defined (linux) && defined (__s390__)
--
--#define IMAGE_BYTE_ORDER MSBFirst
--#define BITMAP_BIT_ORDER MSBFirst
--#define GLYPHPADBYTES 4
--
--#define BITMAP_SCANLINE_UNIT 8
--
--#endif /* linux/s390 */
--
--#if defined (linux) && defined (__s390x__)
--
--#define IMAGE_BYTE_ORDER MSBFirst
--#define BITMAP_BIT_ORDER MSBFirst
--#define GLYPHPADBYTES 4
--
--#define BITMAP_SCANLINE_UNIT 8
--
--#endif /* linux/s390x */
--
--
--#if defined(__ia64__) || defined(ia64)
--# define IMAGE_BYTE_ORDER LSBFirst
--
--# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
--# define BITMAP_BIT_ORDER MSBFirst
--# else
--# define BITMAP_BIT_ORDER LSBFirst
--# endif
--
--# if defined(XF86MONOVGA) || defined(XF86VGA16)
--# define BITMAP_SCANLINE_UNIT 8
--# endif
--
--# define GLYPHPADBYTES 4
--
--#endif /* ia64 */
--
--#if defined(__amd64__) || defined(amd64) || defined(__amd64)
--# define IMAGE_BYTE_ORDER LSBFirst
--
--# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
--# define BITMAP_BIT_ORDER MSBFirst
--# else
--# define BITMAP_BIT_ORDER LSBFirst
--# endif
--
--# if defined(XF86MONOVGA) || defined(XF86VGA16)
--# define BITMAP_SCANLINE_UNIT 8
--# endif
--
--# define GLYPHPADBYTES 4
--/* ???? */
--#endif /* AMD64 */
--
--#ifdef stellar
--
--#define IMAGE_BYTE_ORDER MSBFirst /* Values for the stellar only*/
--#define BITMAP_BIT_ORDER MSBFirst
--#define GLYPHPADBYTES 4
--#define IMAGE_BUFSIZE (64*1024)
--/*
-- * Use SysV random number generator.
-- */
--#define random rand
--
--#endif /* stellar */
--
--#ifdef luna
--
--#define IMAGE_BYTE_ORDER MSBFirst /* Values for the OMRON only*/
--#define BITMAP_BIT_ORDER MSBFirst
--#define GLYPHPADBYTES 4
--
--#ifndef mc68000
--#endif
--
--#endif /* luna */
--
--#if (defined(SVR4) && defined(i386)) || \
-- defined(__alpha__) || defined(__alpha) || \
-- defined(__i386__) || defined(__i386) || \
-- defined(__s390x__) || defined(__s390__)
--
--#ifndef IMAGE_BYTE_ORDER
--#define IMAGE_BYTE_ORDER LSBFirst
--#endif
--
--#ifndef BITMAP_BIT_ORDER
--# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
--# define BITMAP_BIT_ORDER MSBFirst
--# else
--# define BITMAP_BIT_ORDER LSBFirst
--# endif
--#endif
--
--#ifndef BITMAP_SCANLINE_UNIT
--# if defined(XF86MONOVGA) || defined(XF86VGA16)
--# define BITMAP_SCANLINE_UNIT 8
--# endif
- #endif
-
- #ifndef GLYPHPADBYTES
- #define GLYPHPADBYTES 4
- #endif
--
--#ifdef XSVGA
--#define AVOID_GLYPHBLT
--#define NO_ONE_RECT
--#endif
--
--#endif /* SVR4 / BSD / i386 */
--
--#if defined (linux) && defined (__mc68000__)
--
--#define IMAGE_BYTE_ORDER MSBFirst
--#define BITMAP_BIT_ORDER MSBFirst
--#define GLYPHPADBYTES 4
--
--#endif /* linux/m68k */
--
--/* linux on the Compaq Itsy */
--#if defined(linux) && defined(__arm__)
--#define IMAGE_BYTE_ORDER LSBFirst
--#define BITMAP_BIT_ORDER LSBFirst
--#define GLYPHPADBYTES 4
--#endif
-
- /* size of buffer to use with GetImage, measured in bytes. There's obviously
- * a trade-off between the amount of stack (or whatever ALLOCATE_LOCAL gives
diff --git a/debian/patches/0007_fix-ftbfs-on-mips64el.patch b/debian/patches/0007_fix-ftbfs-on-mips64el.patch
deleted file mode 100644
index 6fcd32a..0000000
--- a/debian/patches/0007_fix-ftbfs-on-mips64el.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
-Description: Fix FTBFS on mip64el architecture
-
---- a/nx-X11/config/cf/Imake.cf
-+++ b/nx-X11/config/cf/Imake.cf
-@@ -889,6 +889,9 @@
- # undef __mips__
- # if defined(MIPSEL) || defined(_MIPSEL)
- # define MipselArchitecture
-+# if (_MIPS_SIM == _ABI64)
-+# define Mips64elArchitecture
-+# endif
- # endif
- # undef MIPSEL
- # undef _MIPSEL
---- a/nx-X11/config/cf/linux.cf
-+++ b/nx-X11/config/cf/linux.cf
-@@ -733,7 +733,7 @@
- # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
- #endif /* Mc68020Architecture */
-
--#ifdef MipsArchitecture
-+#if defined(MipsArchitecture) && !defined(MipselArchitecture)
- # ifndef OptimizedCDebugFlags
- # define OptimizedCDebugFlags DefaultGcc2MipsOpt
- # endif
-@@ -742,6 +742,21 @@
- # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
- #endif
-
-+#ifdef MipselArchitecture
-+# ifndef OptimizedCDebugFlags
-+# define OptimizedCDebugFlags DefaultGcc2MipsOpt
-+# endif
-+# define LinuxMachineDefines -D__MIPSEL__
-+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
-+# ifdef Mips64elArchitecture
-+# define AsOutputArchSize 64
-+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
-+# else
-+# define AsOutputArchSize 32
-+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
-+# endif
-+#endif
-+
- #ifdef Ppc64Architecture
- # define DefaultCCOptions -mminimal-toc
- # ifndef OptimizedCDebugFlags
diff --git a/debian/patches/series b/debian/patches/series
index fc07fd7..79df365 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-0001_fix-ftbfs-on-hppa.patch
-0007_fix-ftbfs-on-mips64el.patch
2001_nx-X11_install-location.debian.patch
2002_xserver-xext_set-securitypolicy-path.debian.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/nx-libs.git
More information about the pkg-remote-commits
mailing list