commit: 838cc903ba17bc4e1b707f0172ee15dcff138208
Author: Quincy Fleming <quincyf467 <AT> protonmail <DOT> com>
AuthorDate: Tue Mar 26 23:41:46 2024 +0000
Commit: Quincy Fleming <quincyf467 <AT> protonmail <DOT> com>
CommitDate: Tue Mar 26 23:41:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=838cc903
dev-embedded/qdl: Drop version 1.0
Signed-off-by: Quincy Fleming <quincyf467 <AT> protonmail.com>
dev-embedded/qdl/Manifest | 2 +-
dev-embedded/qdl/files/include_stdlib-1.0.patch | 23 ----------------------
...lude_stdlib-9999.patch => include_stdlib.patch} | 0
.../{qdl-9999-makefile.patch => makefile.patch} | 0
dev-embedded/qdl/files/qdl-1.0-makefile.patch | 17 ----------------
.../qdl/{qdl-1.0.ebuild => qdl-20230411.ebuild} | 9 ++++++---
dev-embedded/qdl/qdl-9999.ebuild | 4 ++--
7 files changed, 9 insertions(+), 46 deletions(-)
diff --git a/dev-embedded/qdl/Manifest b/dev-embedded/qdl/Manifest
index e7c95553f4..e8e3e0b1c2 100644
--- a/dev-embedded/qdl/Manifest
+++ b/dev-embedded/qdl/Manifest
@@ -1 +1 @@
-DIST qdl-1.0.tar.gz 8418 BLAKE2B
49b7bdc7c39c3cd883549c984cb8d0e5a2493752d0bc0bd61261ee681e4fab8913a98e1e7070c668beb4998dc6f574223d7ba5b54ed7e39d157e7243bd19e8ce
SHA512
561b6ffaf26d063f107a0769b41d0ed02f1f6c4656b6284e653e8baf69b2f34d5f6051e54bb45ab55c028bb8bfa9b4e5218b796dbdb7ab7686576168b1b11d77
+DIST qdl-20230411.tar.gz 14561 BLAKE2B
6e80a2e6b8509abd1678dfda244130499655dd9a5a923149f41c22791b1f52ecc6166d09012f1cf1cb4ec954dc20669aa0e566956750b381827e8dd1df829ed3
SHA512
ebd45bfdec65c7a9c0c8a0e187b73940342988bb3ca3bfd7cf84f08cef90afa5c5331f0ccb047f580d9209ded7f4e4ca4146c7f9a4fe4a7ab3a88c2406c7903d
diff --git a/dev-embedded/qdl/files/include_stdlib-1.0.patch
b/dev-embedded/qdl/files/include_stdlib-1.0.patch
deleted file mode 100644
index c2b4a49729..0000000000
--- a/dev-embedded/qdl/files/include_stdlib-1.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-#Created by Quincy Fleming
-#Failure to compile without include "<stdlib.h>"
-#Bug: https://bugs.gentoo.org/927801
---- a/patch.c
-+++ b/patch.c
-@@ -30,6 +30,7 @@
- */
- #include <errno.h>
- #include <string.h>
-+#include <stdlib.h>
- #include <libxml/parser.h>
- #include <libxml/tree.h>
-
---- a/program.c
-+++ b/program.c
-@@ -31,6 +31,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <string.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <libxml/parser.h>
- #include <libxml/tree.h>
diff --git a/dev-embedded/qdl/files/include_stdlib-9999.patch
b/dev-embedded/qdl/files/include_stdlib.patch
similarity index 100%
rename from dev-embedded/qdl/files/include_stdlib-9999.patch
rename to dev-embedded/qdl/files/include_stdlib.patch
diff --git a/dev-embedded/qdl/files/qdl-9999-makefile.patch
b/dev-embedded/qdl/files/makefile.patch
similarity index 100%
rename from dev-embedded/qdl/files/qdl-9999-makefile.patch
rename to dev-embedded/qdl/files/makefile.patch
diff --git a/dev-embedded/qdl/files/qdl-1.0-makefile.patch
b/dev-embedded/qdl/files/qdl-1.0-makefile.patch
deleted file mode 100644
index e6c7ab1223..0000000000
--- a/dev-embedded/qdl/files/qdl-1.0-makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#Created by Quincy Fleming
-#CFLAGS and LDFLAGS were not being respected
-#Bug links: https://bugs.gentoo.org/910480 https://bugs.gentoo.org/910481
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,8 @@
- OUT := qdl
-
--CFLAGS := -O2 -Wall -g `xml2-config --cflags`
--LDFLAGS := `xml2-config --libs`
--prefix := /usr/local
-+CFLAGS += `${PKG_CONFIG} --cflags libxml-2.0`
-+LDFLAGS += `${PKG_CONFIG} --libs libxml-2.0 libudev`
-+prefix = ${EPREFIX}/usr
-
- SRCS := firehose.c qdl.c sahara.c util.c patch.c program.c
- OBJS := $(SRCS:.c=.o)
diff --git a/dev-embedded/qdl/qdl-1.0.ebuild
b/dev-embedded/qdl/qdl-20230411.ebuild
similarity index 68%
rename from dev-embedded/qdl/qdl-1.0.ebuild
rename to dev-embedded/qdl/qdl-20230411.ebuild
index 7b7835782f..1b463b9645 100644
--- a/dev-embedded/qdl/qdl-1.0.ebuild
+++ b/dev-embedded/qdl/qdl-20230411.ebuild
@@ -6,8 +6,11 @@ EAPI=8
inherit toolchain-funcs
DESCRIPTION="Tool to communicate with Qualcomm System On a Chip bootroms"
+COMMIT_ID="3b22df2bc7de02d867334af3a7aa8606db4f8cdd"
HOMEPAGE="https://github.com/andersson/qdl";
-SRC_URI="https://github.com/andersson/qdl/archive/refs/tags/v${PV}.tar.gz ->
${P}.tar.gz"
+SRC_URI="https://github.com/linux-msm/qdl/archive/${COMMIT_ID}.tar.gz ->
${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${COMMIT_ID}"
LICENSE="BSD"
SLOT="0"
@@ -19,8 +22,8 @@ BDEPEND="virtual/libudev
"
PATCHES=(
- "${FILESDIR}/${P}-makefile.patch"
- "${FILESDIR}/include_stdlib-${PV}.patch"
+ "${FILESDIR}/makefile.patch"
+ "${FILESDIR}/include_stdlib.patch"
)
src_compile() {
diff --git a/dev-embedded/qdl/qdl-9999.ebuild b/dev-embedded/qdl/qdl-9999.ebuild
index 3832903dcb..263372f242 100644
--- a/dev-embedded/qdl/qdl-9999.ebuild
+++ b/dev-embedded/qdl/qdl-9999.ebuild
@@ -18,8 +18,8 @@ BDEPEND="virtual/libudev
"
PATCHES=(
- "${FILESDIR}/${P}-makefile.patch"
- "${FILESDIR}/include_stdlib-${PV}.patch"
+ "${FILESDIR}/makefile.patch"
+ "${FILESDIR}/include_stdlib.patch"
)
src_compile() {
