tiscamera: 0.9.1 -> 0.11.1, fix build w/glibc-2.30
This commit is contained in:
parent
57d1caf9f6
commit
b7574e08a0
|
@ -1,48 +0,0 @@
|
|||
diff --git a/src/gstreamer-1.0/gsttcamsrc.cpp b/src/gstreamer-1.0/gsttcamsrc.cpp
|
||||
index d482e1e..e36afd8 100644
|
||||
--- a/src/gstreamer-1.0/gsttcamsrc.cpp
|
||||
+++ b/src/gstreamer-1.0/gsttcamsrc.cpp
|
||||
@@ -1112,6 +1112,7 @@ bool gst_tcam_src_init_camera (GstTcamSrc* self)
|
||||
|
||||
static void gst_tcam_src_close_camera (GstTcamSrc* self)
|
||||
{
|
||||
+ GST_INFO("Closing device");
|
||||
if (self->device != NULL)
|
||||
{
|
||||
self->device->dev->stop_stream();
|
||||
@@ -1156,7 +1157,7 @@ static gboolean gst_tcam_src_stop (GstBaseSrc* src)
|
||||
|
||||
self->device->dev->stop_stream();
|
||||
gst_element_send_event(GST_ELEMENT(self), gst_event_new_eos());
|
||||
- GST_DEBUG_OBJECT (self, "Stopped acquisition");
|
||||
+ GST_DEBUG("Stopped acquisition");
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -1556,6 +1557,18 @@ static void gst_tcam_src_get_property (GObject* object,
|
||||
}
|
||||
|
||||
|
||||
+static gboolean gst_tcam_src_unlock (GstBaseSrc* src)
|
||||
+{
|
||||
+ GstTcamSrc* self = GST_TCAM_SRC(src);
|
||||
+
|
||||
+ self->is_running = FALSE;
|
||||
+
|
||||
+ self->cv.notify_all();
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
+
|
||||
static void gst_tcam_src_class_init (GstTcamSrcClass* klass)
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
||||
@@ -1616,6 +1629,7 @@ static void gst_tcam_src_class_init (GstTcamSrcClass* klass)
|
||||
gstbasesrc_class->fixate = gst_tcam_src_fixate_caps;
|
||||
gstbasesrc_class->start = gst_tcam_src_start;
|
||||
gstbasesrc_class->stop = gst_tcam_src_stop;
|
||||
+ gstbasesrc_class->unlock = gst_tcam_src_unlock;
|
||||
gstbasesrc_class->negotiate = gst_tcam_src_negotiate;
|
||||
gstbasesrc_class->get_times = gst_tcam_src_get_times;
|
||||
|
|
@ -11,17 +11,23 @@
|
|||
, gobject-introspection
|
||||
, gst_all_1
|
||||
, libwebcam
|
||||
, libunwind
|
||||
, gstreamer
|
||||
, elfutils
|
||||
, orc
|
||||
, python3
|
||||
, libuuid
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tiscamera";
|
||||
version = "0.9.1";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TheImagingSource";
|
||||
repo = pname;
|
||||
rev = "v-${pname}-${version}";
|
||||
sha256 = "143yp6bpzj3rqfnrcnlrcwggay37fg6rkphh4w9y9v7v4wllzf87";
|
||||
sha256 = "07vp6khgl6qd3a4519dmx1s5bfw7pld793p50pjn29fqh91fm93g";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -39,6 +45,12 @@ stdenv.mkDerivation rec {
|
|||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
libwebcam
|
||||
libunwind
|
||||
gstreamer
|
||||
elfutils
|
||||
orc
|
||||
python3
|
||||
libuuid
|
||||
];
|
||||
|
||||
|
||||
|
@ -50,13 +62,8 @@ stdenv.mkDerivation rec {
|
|||
"-DBUILD_LIBUSB=ON"
|
||||
];
|
||||
|
||||
|
||||
patches = [
|
||||
./allow-pipeline-stop-in-trigger-mode.patch # To be removed next release.
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./data/udev/80-theimagingsource-cameras.rules \
|
||||
substituteInPlace ./data/udev/80-theimagingsource-cameras.rules.in \
|
||||
--replace "/usr/bin/uvcdynctrl" "${libwebcam}/bin/uvcdynctrl" \
|
||||
--replace "/path/to/tiscamera/uvc-extensions" "$out/share/uvcdynctrl/data/199e"
|
||||
|
||||
|
@ -94,4 +101,4 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ jraygauthier ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue