* [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/
@ 2019-02-09 20:12 Aaron Bauman
0 siblings, 0 replies; 4+ messages in thread
From: Aaron Bauman @ 2019-02-09 20:12 UTC (permalink / raw
To: gentoo-commits
commit: 216425aa738a3aa0c4eace62446cc98605bf6f4b
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jan 11 17:59:09 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Feb 9 20:12:30 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216425aa
media-gfx/zbar: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
media-gfx/zbar/files/zbar-0.10-python-crash.patch | 19 ---------
media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch | 49 ----------------------
2 files changed, 68 deletions(-)
diff --git a/media-gfx/zbar/files/zbar-0.10-python-crash.patch b/media-gfx/zbar/files/zbar-0.10-python-crash.patch
deleted file mode 100644
index a6f7a96e34d..00000000000
--- a/media-gfx/zbar/files/zbar-0.10-python-crash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://sourceforge.net/p/zbar/patches/37/
-
-fix from Debian for crashes when importing the python module.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702499
-
-this doesn't happen on some arches as the data naturally ends up with zero
-data after the structure, but on some (like arm), it isn't so we crash when
-python walks the list.
-
---- a/python/imagescanner.c
-+++ b/python/imagescanner.c
-@@ -68,6 +68,7 @@ imagescanner_get_results (zbarImageScanner *self,
-
- static PyGetSetDef imagescanner_getset[] = {
- { "results", (getter)imagescanner_get_results, },
-+ { NULL },
- };
-
- static PyObject*
diff --git a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch b/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
deleted file mode 100644
index 4fde95e2b56..00000000000
--- a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- zbar-0.10/zbar/video/v4l2.c 2009-10-23 18:16:44.000000000 +0000
-+++ zbar-0.10/zbar/video/v4l2.c 2015-03-07 05:46:36.000000000 +0000
-@@ -241,6 +241,21 @@
- return(0);
- }
-
-+static int v4l2_request_buffers (zbar_video_t *vdo)
-+{
-+ struct v4l2_requestbuffers rb;
-+ memset(&rb, 0, sizeof(rb));
-+ rb.count = vdo->num_images;
-+ rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+ rb.memory = V4L2_MEMORY_USERPTR;
-+ if(ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
-+ return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-+ "requesting video frame buffers (VIDIOC_REQBUFS)"));
-+ if(rb.count)
-+ vdo->num_images = rb.count;
-+ return(0);
-+}
-+
- static int v4l2_set_format (zbar_video_t *vdo,
- uint32_t fmt)
- {
-@@ -308,6 +323,8 @@
- return(-1);
- if(vdo->iomode == VIDEO_MMAP)
- return(v4l2_mmap_buffers(vdo));
-+ if(vdo->iomode == VIDEO_USERPTR)
-+ return(v4l2_request_buffers(vdo));
- return(0);
- }
-
-@@ -337,8 +354,13 @@
- else {
- if(!vdo->iomode)
- vdo->iomode = VIDEO_USERPTR;
-- if(rb.count)
-- vdo->num_images = rb.count;
-+ /* releasing buffers
-+ * lest the driver may later refuse to change format
-+ */
-+ rb.count = 0;
-+ if (ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
-+ zprintf(0, "WARNING: releasing video buffers failed: error %d\n",
-+ errno);
- }
- return(0);
- }
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/
@ 2020-04-26 13:37 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-04-26 13:37 UTC (permalink / raw
To: gentoo-commits
commit: c4b3f3e8d1f7bc7bdc1f1d98b1361ebd1314c66f
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Apr 26 10:28:55 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 13:36:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4b3f3e8
media-gfx/zbar: remove unused patch
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15525
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/zbar-0.10_p20121015-ImageMagick-7.patch | 27 ----------------------
1 file changed, 27 deletions(-)
diff --git a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch b/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch
deleted file mode 100644
index f58c3e4d9c4..00000000000
--- a/media-gfx/zbar/files/zbar-0.10_p20121015-ImageMagick-7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fixed build with imagemagick-7 (bug #592324).
-Thanks-to: Jürgen Rose
-
-diff -r -U3 zbar-0.10_p20121015_orig/configure.ac zbar-0.10_p20121015/configure.ac
---- zbar-0.10_p20121015_orig/configure.ac 2016-08-28 16:59:23.969753652 +0200
-+++ zbar-0.10_p20121015/configure.ac 2016-08-28 17:17:15.384494517 +0200
-@@ -324,7 +324,7 @@
- dnl double check ImageMagick install (bug #2582232)
- CPPFLAGS_save="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS"
-- AC_CHECK_HEADER([wand/MagickWand.h],
-+ AC_CHECK_HEADER([MagickWand/MagickWand.h],
- [have_IM="yes"],
- [have_IM="broken"])
- CPPFLAGS="$CPPFLAGS_save"])])
-diff -r -U3 zbar-0.10_p20121015_orig/zbarimg/zbarimg.c zbar-0.10_p20121015/zbarimg/zbarimg.c
---- zbar-0.10_p20121015_orig/zbarimg/zbarimg.c 2015-08-05 11:10:32.000000000 +0200
-+++ zbar-0.10_p20121015/zbarimg/zbarimg.c 2016-08-28 17:10:39.532787196 +0200
-@@ -44,7 +44,7 @@
- #endif
-
- #ifdef HAVE_IMAGEMAGICK
--# include <wand/MagickWand.h>
-+# include <MagickWand/MagickWand.h>
-
- /* ImageMagick frequently changes API names - just use the original
- * (more stable?) names to match GraphicsMagick
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/
@ 2021-02-27 16:35 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-02-27 16:35 UTC (permalink / raw
To: gentoo-commits
commit: 39a498488dcbed644cdf0cfa10c8ca9d70e7066a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 27 16:29:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 16:29:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a49848
media-gfx/zbar: add musl patch metadata
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
index 3262dd1abcb..916dee61d43 100644
--- a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
+++ b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
@@ -1,5 +1,4 @@
-diff --git a/zbarcam/zbarcam.c b/zbarcam/zbarcam.c
-index f7ea281..2452613 100644
+https://github.com/mchehab/zbar/pull/115
--- a/zbarcam/zbarcam.c
+++ b/zbarcam/zbarcam.c
@@ -37,6 +37,7 @@
@@ -10,8 +9,6 @@ index f7ea281..2452613 100644
# define _(string) gettext(string)
#else
# define _(string) string
-diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
-index 0796fd8..3192ec1 100644
--- a/zbarimg/zbarimg.c
+++ b/zbarimg/zbarimg.c
@@ -42,6 +42,7 @@
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/
@ 2024-10-13 13:43 Conrad Kostecki
0 siblings, 0 replies; 4+ messages in thread
From: Conrad Kostecki @ 2024-10-13 13:43 UTC (permalink / raw
To: gentoo-commits
commit: ee2b4de83d32e179e8047d5425646ba80ba3473e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 12 17:47:35 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 13:40:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee2b4de8
media-gfx/zbar: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../zbar/files/zbar-0.23.90-fix-gtk-default.patch | 35 ----------------------
| 18 -----------
.../zbar/files/zbar-0.23.92-py311-set-size.patch | 30 -------------------
3 files changed, 83 deletions(-)
diff --git a/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch b/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch
deleted file mode 100644
index b1316243dd24..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 468f6bda627d683b3f40dbaf242c158409666f7e Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-Date: Sat, 13 Mar 2021 18:04:57 +0100
-Subject: [PATCH] configure.ac: fix some issues with gtk parameter
-
-By default, it uses Gtk3. Also, the with_gtk set to "no"
-is wrong.
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b6f87531..30a59f72 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -492,7 +492,7 @@ AS_IF([test "x$with_npapi" != "xno"],
- AM_CONDITIONAL([HAVE_NPAPI], [test "x$with_npapi" = "xyes"])
-
- dnl GTK
--dnl For now, defaults to GTK version 2
-+dnl For now, defaults to GTK version 3
-
- AC_ARG_WITH([gtk],
- [AS_HELP_STRING([--with-gtk],
-@@ -500,7 +500,7 @@ AC_ARG_WITH([gtk],
- [AS_IF([test "x$with_gtk" != "xno" && test "x$with_gtk" != "xauto" &&
- test "x$with_gtk" != "xgtk2" && test "x$with_gtk" != "xgtk3"],
- [echo "Invalid value for --with-gtk. Falling back to 'no'"
-- with_gtk="xno"])],
-+ with_gtk="no"])],
- [with_gtk="auto"])
-
- AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal])
diff --git a/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch b/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch
deleted file mode 100644
index e8f6357eb486..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac 2019-05-23 23:37:12.000000000 +0300
-+++ b/configure.ac 2020-01-22 12:27:14.190755156 +0300
-@@ -638,13 +638,9 @@
-
- AC_ARG_VAR([MOC], [full path to Qt moc program])
-
--AS_IF([test "x$have_x" = "xyes"],
-- [qt_extra="Qt5X11Extras >= 5.0"],
-- [qt_extra=""])
--
- AS_IF([test "x$with_qt" != "xno"],
- [PKG_CHECK_MODULES([QT],
-- [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 $qt_extra],,
-+ [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0],,
- [with_qt5="no"
- PKG_CHECK_MODULES([QT],
- [QtCore >= 4 QtGui >= 4],,
diff --git a/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch b/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch
deleted file mode 100644
index a51193af7777..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream-PR: https://github.com/mchehab/zbar/pull/231
-
-diff --git a/python/enum.c b/python/enum.c
-index ba22ba63..4644509e 100644
---- a/python/enum.c
-+++ b/python/enum.c
-@@ -50,7 +50,11 @@ static zbarEnumItem *enumitem_new(PyTypeObject *type, PyObject *args,
-
- /* we assume the "fast path" for a single-digit ints (see longobject.c) */
- /* this also holds if we get a small_int preallocated long */
-+#if PY_VERSION_HEX >= 0x030900A4
-+ Py_SET_SIZE(&self->val, Py_SIZE(longval));
-+#else
- Py_SIZE(&self->val) = Py_SIZE(longval);
-+#endif
- self->val.ob_digit[0] = longval->ob_digit[0];
- Py_DECREF(longval);
- #else
-@@ -129,7 +133,11 @@ zbarEnumItem *zbarEnumItem_New(PyObject *byname, PyObject *byvalue, int val,
-
- /* we assume the "fast path" for a single-digit ints (see longobject.c) */
- /* this also holds if we get a small_int preallocated long */
-+#if PY_VERSION_HEX >= 0x030900A4
-+ Py_SET_SIZE(&self->val, Py_SIZE(longval));
-+#else
- Py_SIZE(&self->val) = Py_SIZE(longval);
-+#endif
- self->val.ob_digit[0] = longval->ob_digit[0];
- Py_DECREF(longval);
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-13 13:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-26 13:37 [gentoo-commits] repo/gentoo:master commit in: media-gfx/zbar/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-10-13 13:43 Conrad Kostecki
2021-02-27 16:35 Sam James
2019-02-09 20:12 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox