Support modular X11 path to rgb.txt patch by (Ville Skyttä - scop from SF-bugtracker)

Originally committed as revision 5429 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/vhook/imlib2.c b/vhook/imlib2.c
index 1e6da37..35a1925 100644 (file)
--- a/vhook/imlib2.c
+++ b/vhook/imlib2.c
@@ -144,7 +144,9 @@ int Configure(void **ctxp, int argc, char *argv[])
         char buff[256];
         int done = 0;
 
         char buff[256];
         int done = 0;
 

-        f = fopen("/usr/lib/X11/rgb.txt", "r");
+        f = fopen("/usr/share/X11/rgb.txt", "r");
+        if (!f)
+            f = fopen("/usr/lib/X11/rgb.txt", "r");

         if (!f) {
             fprintf(stderr, "Failed to find rgb.txt\n");
             return -1;
         if (!f) {
             fprintf(stderr, "Failed to find rgb.txt\n");
             return -1;