cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the correct default devices for CDROM / DVD playback on OpenBSD; copied

Browse Source 
over from MPlayer.

ok sthen@
This commit is contained in:
brad 2015-02-17 01:27:11 +00:00
parent b53d2bea6e
commit c1cd550c43
4 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/mpv/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2015/02/13 13:49:45 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2015/02/17 01:27:11 brad Exp $
# requires 64-bit atomic ops.
# some other arch could probably be added..certainly fails on i386
@ -7,6 +7,7 @@ ONLY_FOR_ARCHS = amd64
COMMENT = movie player based on MPlayer/mplayer2
V = 0.7.3
DISTNAME = mpv-${V}
REVISION = 0
GH_ACCOUNT= mpv-player
GH_PROJECT= mpv

12
multimedia/mpv/patches/patch-DOCS_man_mpv_rst Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-DOCS_man_mpv_rst,v 1.1 2015/02/17 01:27:11 brad Exp $
--- DOCS/man/mpv.rst.orig Fri Feb 13 22:10:04 2015
+++ DOCS/man/mpv.rst Fri Feb 13 22:10:15 2015
@@ -847,7 +847,7 @@ Play a multi-angle DVD:
``mpv dvd://1 --dvd-angle=2``
Play from a different DVD device:
- ``mpv dvd://1 --dvd-device=/dev/dvd2``
+ ``mpv dvd://1 --dvd-device=/dev/rcd2c``
Play DVD video from a directory with VOB files:
``mpv dvd://1 --dvd-device=/path/to/directory/``

16
multimedia/mpv/patches/patch-DOCS_man_options_rst Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-DOCS_man_options_rst,v 1.1 2015/02/17 01:27:11 brad Exp $
--- DOCS/man/options.rst.orig Fri Feb 13 22:05:13 2015
+++ DOCS/man/options.rst Fri Feb 13 22:05:39 2015
@@ -1786,10 +1786,10 @@ Disc Devices
------------
``--cdrom-device=<path>``
- Specify the CD-ROM device (default: ``/dev/cdrom``).
+ Specify the CD-ROM device (default: ``/dev/rcd0c``).
``--dvd-device=<path>``
- Specify the DVD device or .iso filename (default: ``/dev/dvd``). You can
+ Specify the DVD device or .iso filename (default: ``/dev/rcd0c``). You can
also specify a directory that contains files previously copied directly
from a DVD (with e.g. vobcopy).

24
multimedia/mpv/patches/patch-old-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-old-configure,v 1.1.1.1 2015/01/11 08:21:39 bentley Exp $
--- old-configure.orig Sat Dec 20 12:00:13 2014
+++ old-configure Fri Jan 2 23:33:22 2015
$OpenBSD: patch-old-configure,v 1.2 2015/02/17 01:27:11 brad Exp $
--- old-configure.orig Mon Jan 26 20:23:08 2015
+++ old-configure Fri Feb 13 21:55:41 2015
@@ -191,7 +191,7 @@ options_state_machine() {
opt_yes_no _libavresample "libavresample (preferred over libswresample)"
opt_yes_no _libswresample "libswresample"
@ -19,7 +19,7 @@ $OpenBSD: patch-old-configure,v 1.1.1.1 2015/01/11 08:21:39 bentley Exp $
test -n "$mplayer_tmpdir" || die "Unable to create tmpdir."
trap 'rm -rf "$mplayer_tmpdir"' EXIT
@@ -670,6 +670,8 @@ EOF
@@ -665,6 +665,8 @@ EOF
_gl_wayland=yes
libs_mplayer="$libs_mplayer -lGL -lEGL"
test "$_gl_wayland" = yes && res_comment="$res_comment wayland"
@ -28,7 +28,7 @@ $OpenBSD: patch-old-configure,v 1.1.1.1 2015/01/11 08:21:39 bentley Exp $
fi
if test "$_x11" = yes && test "$_gl" = yes && pkg_config_add "egl"; then
_gl_x11_egl=yes
@@ -864,9 +866,11 @@ test_lua() {
@@ -863,9 +865,11 @@ test_lua() {
test_lua "lua >= 5.1.0 lua < 5.2.0"
test_lua "lua5.1 >= 5.1.0" # debian
@ -40,3 +40,17 @@ $OpenBSD: patch-old-configure,v 1.1.1.1 2015/01/11 08:21:39 bentley Exp $
test "$_lua" != yes && check_yes_no no LUA
@@ -983,8 +987,13 @@ cat > $TMPC << EOF
#define HAVE_NETBSD_THREAD_NAME 0
#define HAVE_DXVA2_HWACCEL 0
+#ifdef __OpenBSD__
+#define DEFAULT_CDROM_DEVICE "/dev/rcd0c"
+#define DEFAULT_DVD_DEVICE "/dev/rcd0c"
+#else
#define DEFAULT_CDROM_DEVICE "/dev/cdrom"
#define DEFAULT_DVD_DEVICE "/dev/dvd"
+#endif
#define PATH_DEV_DSP "/dev/dsp"
#define PATH_DEV_MIXER "/dev/mixer"