summaryrefslogtreecommitdiff
authordrw <drw>2004-04-01 20:22:05 (UTC)
committer drw <drw>2004-04-01 20:22:05 (UTC)
commit1196811eb5fd6f4894b36bbebf81a8eca494f786 (patch) (side-by-side diff)
tree4684d983967702e7f55c11fcd9eeb63601123fd0
parent7804289bee604cd1e299f4911fa18dcfda37352f (diff)
downloadopie-1196811eb5fd6f4894b36bbebf81a8eca494f786.zip
opie-1196811eb5fd6f4894b36bbebf81a8eca494f786.tar.gz
opie-1196811eb5fd6f4894b36bbebf81a8eca494f786.tar.bz2
Link to libopie2 stuff and update depends
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/config.in2
-rw-r--r--core/multimedia/opieplayer/opie-mediaplayer.control2
-rw-r--r--core/multimedia/opieplayer/opieplayer.pro2
3 files changed, 3 insertions, 3 deletions
diff --git a/core/multimedia/opieplayer/config.in b/core/multimedia/opieplayer/config.in
index 335497f..6188948 100644
--- a/core/multimedia/opieplayer/config.in
+++ b/core/multimedia/opieplayer/config.in
@@ -1,12 +1,12 @@
config OPIEPLAYER
boolean "opie-mediaplayer (mediaplayer that plays mp3, mpeg, and wav)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
source core/multimedia/opieplayer/libflash/config.in
source core/multimedia/opieplayer/libmad/config.in
source core/multimedia/opieplayer/libmpeg3/config.in
source core/multimedia/opieplayer/modplug/config.in
source core/multimedia/opieplayer/wavplugin/config.in
source core/multimedia/opieplayer/vorbis/tremor/config.in
source core/multimedia/opieplayer/vorbis/config.in
diff --git a/core/multimedia/opieplayer/opie-mediaplayer.control b/core/multimedia/opieplayer/opie-mediaplayer.control
index 8597e8e..100196a 100644
--- a/core/multimedia/opieplayer/opie-mediaplayer.control
+++ b/core/multimedia/opieplayer/opie-mediaplayer.control
@@ -1,10 +1,10 @@
Package: opie-mediaplayer
Files: bin/opieplayer pics/opieplayer apps/Applications/opieplayer.desktop
Priority: optional
Section: opie/applications
Maintainer: L.J. Potter <lpotter@trolltech.com>
Architecture: arm
-Depends: task-opie-minimal, libopie1, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape
+Depends: task-opie-minimal, libopiecore2, libopieui2, opie-mediaplayer2-skin-default | opie-mediaplayer2-skin-default-landscape
Description: The Opie media player
The mediaplayer for Opie. It plays mp3, mpeg, mod and wav.
Version: $QPE_VERSION$EXTRAVERSION
diff --git a/core/multimedia/opieplayer/opieplayer.pro b/core/multimedia/opieplayer/opieplayer.pro
index 0c801ec..705e4e0 100644
--- a/core/multimedia/opieplayer/opieplayer.pro
+++ b/core/multimedia/opieplayer/opieplayer.pro
@@ -1,21 +1,21 @@
TEMPLATE = app
CONFIG = qt warn_on
#
DESTDIR = $(OPIEDIR)/bin
HEADERS = loopcontrol.h mediaplayerplugininterface.h \
playlistselection.h mediaplayerstate.h \
videowidget.h audiowidget.h playlistwidget.h \
mediaplayer.h audiodevice.h inputDialog.h om3u.h
SOURCES = main.cpp \
loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \
videowidget.cpp audiowidget.cpp playlistwidget.cpp \
mediaplayer.cpp audiodevice.cpp inputDialog.cpp om3u.cpp
TARGET = opieplayer
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lpthread -lopieui2
+LIBS += -lqpe -lpthread -lopiecore2 -lopieui2
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
include ( $(OPIEDIR)/include.pro )