diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-06 09:54:55 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-06 09:54:55 -0300 |
| commit | 60f323f25d2c0addbce5832ffbda060b0410d14f (patch) | |
| tree | 644b9212e37f1a63dcef3977159033dee2f04392 /community-staging/openscenegraph/osg-xine-1.2.patch | |
| parent | 9e2eedaa4921b8d57c364fb3e2a8c9e2e96b8e69 (diff) | |
| parent | 817e58c278cb8ebee7743205877d0f67c431fcec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/inetutils/PKGBUILD
extra/audacious/PKGBUILD
extra/cvs/PKGBUILD
kde-unstable/libkipi/PKGBUILD
libre/linux-libre/PKGBUILD
libre/mplayer-vaapi-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/psutils-libre/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
staging/kdebase-runtime/PKGBUILD
Diffstat (limited to 'community-staging/openscenegraph/osg-xine-1.2.patch')
| -rw-r--r-- | community-staging/openscenegraph/osg-xine-1.2.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/community-staging/openscenegraph/osg-xine-1.2.patch b/community-staging/openscenegraph/osg-xine-1.2.patch new file mode 100644 index 000000000..c73b588dc --- /dev/null +++ b/community-staging/openscenegraph/osg-xine-1.2.patch @@ -0,0 +1,14 @@ +diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c +--- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20 14:46:20.000000000 +0300 ++++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c 2012-01-05 02:15:38.000000000 +0400 +@@ -2769,8 +2769,8 @@ + clear(rgb_class, sizeof(rgbout_class_t)); + + rgb_class->driver_class.open_plugin = open_plugin; +- rgb_class->driver_class.get_identifier = get_identifier; +- rgb_class->driver_class.get_description = get_description; ++ rgb_class->driver_class.identifier = get_identifier(NULL); ++ rgb_class->driver_class.description = get_description(NULL); + rgb_class->driver_class.dispose = dispose_class; + + return(rgb_class); |