>Number: 57587
>Category: ports
>Synopsis: [update orphaned port] adapt graphics/multivideo to new wxgtk
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 04 18:50:21 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Pav Lucistnik
>Release: FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD hood.oook.cz 5.1-CURRENT FreeBSD 5.1-CURRENT #2: Thu Sep 25 01:25:46 CEST 2003 root at hood.oook.cz:/usr/obj/usr/src/sys/PAV i386
>Description:
Adapt graphics/multivideo to use wxgtk-2.4.x, one patch was needed
due to change in wxCondition class in new wxgtk. Functionality is same.
Ports remaining to convert to new wxgtk: 3
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/graphics/multivideo/Makefile multivideo/Makefile
--- /usr/ports/graphics/multivideo/Makefile Thu Feb 20 19:08:08 2003
+++ multivideo/Makefile Sun Oct 5 03:23:01 2003
@@ -15,7 +15,7 @@
MAINTAINER= ports at FreeBSD.org
COMMENT= An image sequence viewer
-LIB_DEPENDS= wx_gtk-2.2.2:${PORTSDIR}/x11-toolkits/wxgtk
+LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
WRKSRC= ${WRKDIR}/${PORTNAME}
diff -ruN /usr/ports/graphics/multivideo/files/patch-buffer.cpp multivideo/files/patch-buffer.cpp
--- /usr/ports/graphics/multivideo/files/patch-buffer.cpp Thu Jan 1 01:00:00 1970
+++ multivideo/files/patch-buffer.cpp Sun Oct 5 03:34:09 2003
@@ -0,0 +1,39 @@
+--- buffer.cpp.orig Thu Jan 31 18:46:26 2002
++++ buffer.cpp Sun Oct 5 03:33:25 2003
+@@ -20,6 +20,9 @@
+ #include <iostream>
+ #include "buffer.hh"
+
++wxMutex load_thread_cond_mutex;
++wxMutex thread_proc_cond_mutex;
++
+ buffer::buffer(int nb_pictures, int size,bool free) :
+ number_of_pictures(nb_pictures),
+ buffer_size(size),
+@@ -35,8 +38,8 @@
+ mutex_first_image (new wxMutex()),
+ mutex_loaded_image (new wxMutex()),
+ mutex_last_position (new wxMutex()),
+- load_thread_you_can_load (new wxCondition()),
+- thread_process_you_can_process(new wxCondition())
++ load_thread_you_can_load (new wxCondition(load_thread_cond_mutex)),
++ thread_process_you_can_process(new wxCondition(thread_proc_cond_mutex))
+ {
+ images.resize(number_of_pictures+1);
+ images_process.resize(number_of_pictures+1);
+@@ -429,7 +432,7 @@
+ {
+ delete load_thread_you_can_load;
+ }
+- load_thread_you_can_load=new wxCondition();
++ load_thread_you_can_load=new wxCondition(load_thread_cond_mutex);
+ }
+
+ void buffer::initialize_condition_process()
+@@ -438,5 +441,5 @@
+ {
+ delete thread_process_you_can_process;
+ }
+- thread_process_you_can_process=new wxCondition();
++ thread_process_you_can_process=new wxCondition(thread_proc_cond_mutex);
+ }
>Release-Note:
>Audit-Trail:
>Unformatted: