[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[337] mplayerxp

[<nic...@us...>]

Revision: 337
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=337&view=rev
Author:   nickols_k
Date:     2012-11-12 09:30:30 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
remove obsolete fibmap_player

Modified Paths:
--------------
    mplayerxp/Makefile

Removed Paths:
-------------
    mplayerxp/fibmap_mplayer.c

Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile	2012-11-12 09:27:21 UTC (rev 336)
+++ mplayerxp/Makefile	2012-11-12 09:30:30 UTC (rev 337)
@@ -10,7 +10,6 @@
 include mp_config.mak
 
 PRG = $(PROGNAME)
-PRG_FIBMAP = fibmap_mplayerxp
 PRG_CFG = codec-cfg-xp
 # these subdirectories required installation due binaries within them
 SUBDIRS = libmpdemux libmpsub libplaytree libmpcodecs libmpconf libao2 osdep postproc input2 nls libvo xmpcore
@@ -55,9 +54,6 @@
 CFLAGS = $(OPTFLAGS) $(EXTRA_INC)
 
 ALL_PRG = $(PRG)
-ifeq ($(HAVE_CSS),yes)
-ALL_PRG += $(PRG_FIBMAP)
-endif
 
 .SUFFIXES: .c .o
 
@@ -78,9 +74,6 @@
 $(SRCS_MPLAYER): version.h
 #$(OBJS_MPLAYER): $(SRCS_MPLAYER)
 
-$(PRG_FIBMAP): fibmap_mplayer.o
-	$(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o
-
 $(PRG_CFG): version.h codec-cfg.c codec-cfg.h
 	$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML
 
@@ -100,21 +93,10 @@
 	echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/" ; \
 	fi
 
-ifeq ($(HAVE_CSS),yes)
-	@echo "Following task requires root privs. If it fails don't panic"
-	@echo "however it means you can't use fibmap_mplayer."
-	@echo "Without this (or without running mplayer as root) you won't be"
-	@echo "able to play encrypted DVDs."
-	-$(INSTALL) -D -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(DESTDIR)$(BINDIR)/$(PRG_FIBMAP)
-endif
-
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(PRG)
 	rm -f $(DESTDIR)$(DATADIR)/font/*
 	rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(DATADIR)/font
-ifeq ($(HAVE_CSS),yes)
-	rm -f $(DESTDIR)$(BINDIR)/$(PRG_FIBMAP)
-endif
 	rmdir -p --ignore-fail-on-non-empty $(DESTDIR)$(BINDIR)
 
 clean:
@@ -123,7 +105,7 @@
 
 distclean:
 	$(DO_MAKE)
-	-rm -f *~ $(PRG) $(PRG_FIBMAP) $(OBJS)
+	-rm -f *~ $(PRG) $(OBJS)
 	-rm -f *.o *.a .depend configure.log
 	-rm -f mp_config.h mp_config.mak version.h
 	-rm -f cpuinfo help_mp.h

Deleted: mplayerxp/fibmap_mplayer.c
===================================================================
--- mplayerxp/fibmap_mplayer.c	2012-11-12 09:27:21 UTC (rev 336)
+++ mplayerxp/fibmap_mplayer.c	2012-11-12 09:30:30 UTC (rev 337)
@@ -1,38 +0,0 @@
-/* (C)2001,2002 by LGB (G\xE1bor L\xE9n\xE1rt), lg...@lg...
-   Part of MPlayer project, this source is copyrighted according to GNU/GPL.  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-
-#ifndef FIBMAP
-#define FIBMAP 1
-#endif
-
-int main ( int argc , char ** argv )
-{
-	int fd,lba=0;
-	if (argc!=2) {
-	    fprintf(stderr,"Bad usage.\n");
-	    return 1;
-	}
-	if ((fd = open(argv[1], O_RDONLY)) == -1) {
-    	    fprintf(stderr,"Cannot open file %s: %s\n",
-	    argv[1] ? argv[1] : "(NULL)", strerror(errno));
-    	    return 1;
-	}
-        if (ioctl(fd, FIBMAP, &lba) != 0) {
-	    fprintf(stderr,"fibmap ioctl: %s (Hint: %s is not suid root?)\n",strerror(errno),argv[0]);
-            close(fd);
-            return 1;
-        }
-	close(fd);
-	printf("%d\n",lba);
-	return 0;
-}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.