back to updates

2021-06-30 18:45:43 +02:00
parent 7576f0a9e2
commit 701156bcf9
103 changed files with 2590 additions and 688 deletions
--- a/dev-embedded/cc65/Manifest
+++ b/dev-embedded/cc65/Manifest
@@ -1,7 +1,8 @@
 AUX cc65-2.13.2-asneeded-1.patch 4394 BLAKE2B 3e54a7bf09282f87f6cf6ed8bff08fa9e86d23d7a7968a51aa8dee14b9db31528546ff2d4f51ac29c89d1c6742dbe2ef9305443adaac0989502d41a2598ec5e6 SHA512 98df2303b43c6bb390366d0d5b13a59648a4869c73891114790c9ad7e1cceec22daa3ae171b283ad1e220d35352c15bbc873666b5430eba05e6e6238d6027447
+AUX package-version.patch 2046 BLAKE2B b4a74650e9226dfe677a9edcc84ab17cb055f2c161a5787b8dfd4d96f8e321027acba913340c2ecdbe51a89fc3b7816d48daf06d50037609f97e2610e270f31f SHA512 5658a26b7f7ae020f5f16702b5833913bbd0d7ca1d54cf370c72fe7af00ea582f0a3bd2ee8b4b580f2d6f215807687c4e1cfe9ae5892cfb8e6de6bcfe2196871
 DIST cc65-sources-2.13.3.tar.bz2 1103245 BLAKE2B d111a6354176e5fbfacfcc65a26d10a33868660c674cf0ea614a55748c3e8087be33901801ec038fd21db51459ccaca57a2aeb3ab0c0825771819c95eb64ef5d SHA512 135004bdd50abc749409f4a3efbc5c93a09e940d787b6a2034df4de8459e78fa5f813e2e0673cdf9f8bf50c6df8b1313b36ff395d6e82560d0e669da03130776
 DIST cc65-sources-2.18.tar.gz 2254374 BLAKE2B 2a7a41aca7a8ae300f6b8bd65d083741fc6bad92f37187bae4ffd720c1e0de500e631c765b34dda8fdd36e87d6039daac339348396733a3a92046f5746bec279 SHA512 47e530052911c8fdac0ea560fef78f5971441509f37b4020df54937cf9b5420e07653b3d191c844da0af5dddd17a61e90c3ad3fb56bf7623214977017b4bc9a1
 EBUILD cc65-2.13.3.ebuild 2937 BLAKE2B 9eb8625901d14b90f35b41d7db5f98ab9c008556e4247a44590410dd980170f91ff1ee45fa59b6b0f15bcf2c3b56aedf073cbe2a120c340b407f1c83e1b6f5df SHA512 63195c8bafb9c0c1caeb6f59854bdaa447172b55150554d58ef25af15faf49f68e3734f1710668c754dbbe4186914d9ffe762f3b367a223acd1658685e39bf2d
-EBUILD cc65-2.18.ebuild 3031 BLAKE2B e5ec2779df5971142b4d58ec81ee795750223d038cfffae041ec812667566786db4ec0c276f3f68765aabc8b8f9622bb5736faf9ccf1dbbe5f5505ccbe5a73da SHA512 5521f8ca5fadddb7ffc4bffbea717ae244fd141a9ffbc0b7398e8854d878eef749ff7fa14aec70df9de36aad5b4c18ecfb670f30873f1828423a27f7d8c46a7a
+EBUILD cc65-2.18.ebuild 1561 BLAKE2B ba33d51dbe100020325851e7a8d0d0532f74ec3582c21a0e1981bf47a6fdbb790ac52c154274fd4f20953f33cef1953eeb3fc128d3b2e39cab2e652ac3f929c6 SHA512 922ee38ec82176773308d1e952b5ad3c3b2762f78378cf691583a4701883053b3d339d928801f1fac885db4a502eaaff550dc708622de8fab0c76af29664d6b4
 MISC ChangeLog 3435 BLAKE2B 8fcd42d35073f0c6a4e3fc7e5ccc3546655aa0b7e5c9b9a1fd39178e2cfe12063e881f38e2f0bac802d37026d1746a1d82382017e8553fc7958757640109c9dc SHA512 697503823ef66475d816025b167e9ab0c20f054a360270c8d741bd77810806f35aa7f3add0724755a3bf1218e9f0dca62e1c0ea31d810f70b43f6529d8661049
 MISC metadata.xml 205 BLAKE2B 2885a6508cc84e8c20c79cd20d9fd3269df33e1ce3c6394fda79b8f7f17b6f92ade1a3177ca71e41b027cd1f16cb7795f1dfb4b99a3aa1f6f8055bb778d633a4 SHA512 ef3a39d2cd131cd29451ec2d009484e89b60e8cbeed5fc0f5f899cebb0c5f9867682ce603982e4de32004493944c6ff99a4c797e7ef2441d6049e5a616143a8b
--- a/dev-embedded/cc65/cc65-2.18.ebuild
+++ b/dev-embedded/cc65/cc65-2.18.ebuild
@@ -23,60 +23,19 @@ RDEPEND=""
 #S="${WORKDIR}"/${PN}-snapshot-${PV}

 src_prepare() {
-	# uncomment to install sim65
-	#sed -i -e "s:od65:od65 sim65:g" src/make/gcc.mak
-
-	# correct paths for install (also in documentation)
-	sed -i -e "s:)/lib:)/$(get_libdir):g" make/gcc.mak
-	sed -e "s:/usr/lib/cc65:/usr/$(get_libdir)/cc65:g" \
-	    -i src/ca65/make/gcc.mak -i doc/ca65.sgml \
-	    -i src/cc65/make/gcc.mak -i doc/cc65.sgml \
-	    -i src/ld65/make/gcc.mak -i doc/ld65.sgml
-
-	# solve conflict by renameing make.info to cc65make.info
-	sed -e "s:make.:cc65make.:g" -i doc/index.sgml -i doc/Makefile
-	mv doc/make.sgml doc/cc65make.sgml
-
-#	epatch "${FILESDIR}"/cc65-2.13.2-asneeded-1.patch
+	epatch "${FILESDIR}"/package-version.patch
 }

 src_compile() {
 	# the build needs to be split otherwise we can't specify CC
 	# these makefiles are not parallel build aware
-	emake -j1 -C src -f make/gcc.mak CC="$(tc-getCC)" AR="$(tc-getAR)" \
-		CFLAGS="-g -O2 -Wall -W -std=c89 ${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die "src build fail"
-	emake -j1 -C libsrc || die "libsrc build fail"
-	use doc && emake -j1 -C doc html info
+	emake -C src CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="/usr" PKG_VERSION="gentoo ${PVR}" || die "src build fail"
+	emake -C libsrc CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="/usr" PKG_VERSION="gentoo ${PVR}" || die "libsrc build fail"
+	use doc && emake -C doc html info
 }

 src_install() {
-	# can't trust the install target (sandbox violation) so do it by hand
-	dobin src/*65/*65 src/ca65html/ca65html src/grc/grc  || die "dobin fail"
-	insinto /usr/$(get_libdir)/cc65/emd
-	doins libsrc/*.emd || die "install memory map fail"
-	insinto /usr/$(get_libdir)/cc65/joy
-	doins libsrc/*.joy || die "install joystick driver fail"
-	insinto /usr/$(get_libdir)/cc65/mou
-	doins libsrc/*.mou || die "install mouse driver fail"
-	insinto /usr/$(get_libdir)/cc65/ser
-	doins libsrc/*.ser || die "install UART driver fail"
-	insinto /usr/$(get_libdir)/cc65/tgi
-	doins libsrc/*.tgi || die "install graphic driver fail"
-	insinto /usr/$(get_libdir)/cc65/asminc
-	doins asminc/*.inc || die "install asm include fail"
-	insinto /usr/$(get_libdir)/cc65/include
-	doins -r include/* || die "install include fail"
-	insinto /usr/$(get_libdir)/cc65/lib
-	doins libsrc/*.lib || die "install lib definations fail"
-	doins libsrc/*.o || die "install lib fail"
-	insinto /usr/$(get_libdir)/cc65/cfg
-	doins src/ld65/cfg/*.cfg || die "cfg install fail"
-	use doc && dohtml doc/*.htm*
-	use doc && insinto /usr/share/doc/${PF}/html
-	use doc && doins doc/*.txt
-	doman packages/debian/*.1 || die "man install fail"
-	use doc && doinfo doc/*.info
-	dodoc src/ca65/macpack/*.mac doc/readme.1st \
-		doc/BUGS doc/CREDITS || die "macro & doc install fail"
+	emake -C src CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="${D}/usr" PKG_VERSION="gentoo ${PVR}" install || die "src install failed"
+	emake -C libsrc CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="${D}/usr" PKG_VERSION="gentoo ${PVR}" install || die "libsrc install failed"
+	use doc && emake CC="$(tc-getCC)" AR="$(tc-getAR)" PREFIX="${D}/usr" PKG_VERSION="gentoo ${PVR}" doc html info
 }
--- a/dev-embedded/cc65/files/package-version.patch
+++ b/dev-embedded/cc65/files/package-version.patch
@@ -0,0 +1,47 @@
+Description: Allow overriding git hash in version string with package version
+ When compiling cc65, it will place the git hash of the checked out commit in
+ the version string which isn't useful when building a distribution package
+ since there either won't be an upstream git hash if there is one at all. Make
+ it so that if the variable PKG_VERSION is defined when building, its contents
+ will be placed into the version string instead of the git hash.
+Author: Andreas Bombe <aeb@debian.org>
+Last-Update: 2017-11-16
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: cc65work/src/Makefile
+===================================================================
+--- cc65work.orig/src/Makefile	2017-11-16 01:54:30.795532327 +0100
+++ cc65work/src/Makefile	2017-11-16 02:21:19.661770273 +0100
+@@ -62,11 +62,16 @@ else
+   endif
+ endif
+ 
+ifdef PKG_VERSION
+  $(info PKG_VERSION: $(PKG_VERSION))
+  DEF_PKGVER := -DPKG_VERSION="$(PKG_VERSION)"
+endif
+
+ CFLAGS += -MMD -MP -O3 -I common \
+           -Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS) \
+           -DCA65_INC="$(CA65_INC)" -DCC65_INC="$(CC65_INC)" -DCL65_TGT="$(CL65_TGT)" \
+           -DLD65_LIB="$(LD65_LIB)" -DLD65_OBJ="$(LD65_OBJ)" -DLD65_CFG="$(LD65_CFG)" \
+-          -DGIT_SHA=$(GIT_SHA)
+          -DGIT_SHA=$(GIT_SHA) $(DEF_PKGVER)
+ 
+ LDLIBS += -lm
+ 
+Index: cc65work/src/common/version.c
+===================================================================
+--- cc65work.orig/src/common/version.c	2017-11-16 01:54:30.815532304 +0100
+++ cc65work/src/common/version.c	2017-11-16 02:07:10.974699766 +0100
+@@ -61,7 +61,9 @@
+ /* Returns the version number as a string in a static buffer */
+ {
+     static char Buf[60];
+-#if defined(GIT_SHA)
+#if defined(PKG_VERSION)
+    xsnprintf (Buf, sizeof (Buf), "%u.%u - %s", VER_MAJOR, VER_MINOR, STRINGIZE (PKG_VERSION));
+#elif defined(GIT_SHA)
+     xsnprintf (Buf, sizeof (Buf), "%u.%u - Git %s", VER_MAJOR, VER_MINOR, STRINGIZE (GIT_SHA));
+ #else
+     xsnprintf (Buf, sizeof (Buf), "%u.%u", VER_MAJOR, VER_MINOR);