From patchwork Sun Sep 3 18:56:05 2006 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "C.Y.M" X-Patchwork-Id: 12383 Received: from c-71-197-74-6.hsd1.ca.comcast.net ([71.197.74.6] helo=nofear.bounceme.net) by www.linuxtv.org with esmtp (Exim 4.50) id 1GJx0f-0002pf-Km for vdr@linuxtv.org; Sun, 03 Sep 2006 20:47:58 +0200 Received: from [10.1.1.66] (hades [10.1.1.66]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by nofear.bounceme.net (Postfix) with ESMTP id 8751C7352C for ; Sun, 3 Sep 2006 11:47:55 -0700 (PDT) Message-ID: <44FB2545.8070605@syphir.sytes.net> Date: Sun, 03 Sep 2006 11:56:05 -0700 From: "C.Y.M" Organization: CooLNeT User-Agent: Thunderbird 1.5.0.5 (Windows/20060719) MIME-Version: 1.0 To: Vdr X-Enigmail-Version: 0.94.0.0 Subject: [vdr] sofdevice cvs unused variables X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: syphir@syphir.sytes.net, VDR Mailing List List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Sep 2006 19:42:14 -0000 Status: O X-Status: X-Keywords: X-UID: 10575 I have been trying to clean up my builds and when updated softdevice and softplay via cvs, noticed several warning about unused variables. Also, it appears that softplay does not have the current Makefile fixes required to build under the latest VDR. Best Regards, diff -ru softplay.cvs.orig/Makefile softplay.cvs/Makefile --- softplay.cvs.orig/Makefile 2006-04-26 00:29:15.000000000 -0700 +++ softplay.cvs/Makefile 2006-04-26 00:59:27.000000000 -0700 @@ -24,7 +24,6 @@ ### The directory environment: -DVBDIR = ../../../../DVB VDRDIR = ../../.. LIBDIR = ../../lib TMPDIR = /tmp @@ -35,7 +34,11 @@ ### The version number of VDR (taken from VDR's "config.h"): -VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') +VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) +APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) +ifeq ($(strip $(APIVERSION)),) + APIVERSION = $(VDRVERSION) +endif ### The name of the distribution archive: @@ -44,7 +47,7 @@ ### Includes and Defines (add further entries here): -INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I$(LIBFFMPEG) -I$(LIBFFMPEG)/libavformat -I$(LIBFFMPEG)/libavcodec -I$(LIBFFMPEG)/libavutil +INCLUDES += -I$(VDRDIR)/include -I$(LIBFFMPEG) -I$(LIBFFMPEG)/libavformat -I$(LIBFFMPEG)/libavcodec -I$(LIBFFMPEG)/libavutil DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' @@ -79,7 +82,7 @@ libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@ - @cp $@ $(LIBDIR)/$@.$(VDRVERSION) + @cp $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE)