Ticket #6137: mythtv-libudev.patch
File mythtv-libudev.patch, 3.0 KB (added by , 15 years ago) |
---|
-
mythtv/configure
old new 1199 1199 ivtv 1200 1200 joystick_menu 1201 1201 libfftw3 1202 libudev 1202 1203 lirc 1203 1204 mheg 1204 1205 opengl_video … … 1611 1612 enable ivtv 1612 1613 enable lamemp3 1613 1614 enable lirc 1615 enable libudev 1614 1616 enable mheg 1615 1617 enable opengl 1616 1618 enable opengl_vsync … … 3036 3038 disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib 3037 3039 disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib 3038 3040 3041 # Attempt to use libudev for mediamonitor 3042 if test $target_os = linux; then 3043 check_lib2 libudev.h udev_new || enable libudev 3044 fi 3045 3039 3046 enabled ffmpeg_pthreads && enable pthreads 3040 3047 3041 3048 # check for some common methods of building with pthread support … … 4223 4230 echo "CONFIG_OPENGL_LIBS=-lGL -lGLU" >> $MYTH_CONFIG_MAK 4224 4231 fi 4225 4232 4233 if enabled libudev; then 4234 echo "CONFIG_LIBUDEV_LIBS=-ludev" >> $MYTH_CONFIG_MAK 4235 fi 4236 4226 4237 if test x"$CCONFIG" != x"" ; then 4227 4238 echo "CCONFIG=$CCONFIG" >> $MYTH_CONFIG_MAK 4228 4239 echo "#define MYTH_BUILD_CONFIG \"$CCONFIG\"" >>$TMPH … … 4244 4255 echo "GCC_MINOR=$GCC_MINOR" >> $MYTH_CONFIG_MAK 4245 4256 fi 4246 4257 4258 4247 4259 echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH 4248 4260 4249 4261 cat <<EOF >> $MYTH_CONFIG_MAK -
mythtv/libs/libmyth/libmyth.pro
old new 75 75 LIBS += -L../libavcodec -lmythavcodec-$${LIBVERSION} 76 76 LIBS += -L../libavutil -lmythavutil-$${LIBVERSION} 77 77 unix:LIBS += -ldl 78 using_libudev:LIBS += $${CONFIG_LIBUDEV_LIBS} 78 79 79 80 TARGETDEPS += ../libmythsamplerate/libmythsamplerate-$${MYTH_LIB_EXT} 80 81 TARGETDEPS += ../libmythsoundtouch/libmythsoundtouch-$${MYTH_LIB_EXT} -
mythtv/libs/libmyth/mediamonitor-unix.cpp
old new 39 39 #include "mythhdd.h" 40 40 #include "mythverbose.h" 41 41 42 // Linux headers 43 #ifdef linux 44 #if CONFIG_LIBUDEV == 1 45 extern "C" { 46 #include <libudev.h> 47 } 48 #endif 49 #endif 50 42 51 #ifndef MNTTYPE_ISO9660 43 52 #ifdef linux 44 53 #define MNTTYPE_ISO9660 "iso9660" … … 219 228 ret.replace(QRegExp(".*/"), "/dev/"); 220 229 221 230 #ifdef linux 231 #if CONFIG_LIBUDEV == 1 232 // Use libudev to determine the name 233 ret = ""; 234 struct udev *udev = udev_new(); 235 if (udev != NULL) 236 { 237 struct udev_device *device = 238 udev_device_new_from_syspath(udev, sysfs.toAscii().constData()); 239 if (device != NULL) 240 { 241 const char *name = udev_device_get_devnode(device); 242 243 if (name != NULL) 244 ret = tr(name); 245 246 udev_device_unref(device); 247 } 248 udev_unref(udev); 249 } 250 #else // CONFIG_LIBUDEV 251 // Use udevinfo to determine the name 222 252 QProcess *udevinfo = new QProcess(); 223 253 QTextStream stream(udevinfo); 224 254 QStringList args; … … 263 293 return ret; 264 294 265 295 udevinfo->deleteLater(); 296 #endif // CONFIG_LIBUDEV 266 297 #endif // linux 267 298 268 299 VERBOSE(VB_MEDIA, msg + "->'" + ret + "'");