mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 15:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjustment arm / mips for libplayer3

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 2866328fe2
Author: max_10 <max_10@gmx.de>
Date: 2019-06-15 (Sat, 15 Jun 2019)

Origin message was:
------------------
- Adjustment arm / mips for libplayer3

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2019-06-15 01:45:44 +02:00
parent 8f6c348cd9
commit 0dbb71cb3c
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@@ -65,9 +65,9 @@ libstb_hal_la_LIBADD += \
libarmbox/libarmbox.la \ libarmbox/libarmbox.la \
libdvbci/libdvbci.la libdvbci/libdvbci.la
if !ENABLE_GSTREAMER_10 if !ENABLE_GSTREAMER_10
SUBDIRS += libeplayer3-arm SUBDIRS += libeplayer3
libstb_hal_la_LIBADD += \ libstb_hal_la_LIBADD += \
libeplayer3-arm/libeplayer3_arm.la libeplayer3/libeplayer3.la
endif endif
endif endif
endif endif
@@ -77,7 +77,7 @@ SUBDIRS += libmipsbox libdvbci
libstb_hal_la_LIBADD += \ libstb_hal_la_LIBADD += \
libmipsbox/libmipsbox.la \ libmipsbox/libmipsbox.la \
libdvbci/libdvbci.la libdvbci/libdvbci.la
SUBDIRS += libeplayer3-mips SUBDIRS += libeplayer3
libstb_hal_la_LIBADD += \ libstb_hal_la_LIBADD += \
libeplayer3-mips/libeplayer3_mips.la libeplayer3/libeplayer3.la
endif endif

7
configure.ac
View File

@@ -95,12 +95,12 @@ if test x$BOXTYPE = xgeneric -a x$BOXMODEL != xraspi; then
fi fi
AC_ARG_ENABLE(flv2mpeg4, AC_ARG_ENABLE(flv2mpeg4,
AS_HELP_STRING(--enable-flv2mpeg4, use flv2mpeg4 libeplayer3-arm), AS_HELP_STRING(--enable-flv2mpeg4, use flv2mpeg4 libeplayer3),
,[enable_flv2mpeg4=no]) ,[enable_flv2mpeg4=no])
AM_CONDITIONAL(ENABLE_FLV2MPEG4, test "$enable_flv2mpeg4" = "yes") AM_CONDITIONAL(ENABLE_FLV2MPEG4, test "$enable_flv2mpeg4" = "yes")
if test "$enable_flv2mpeg4" = "yes"; then if test "$enable_flv2mpeg4" = "yes"; then
AC_DEFINE(ENABLE_FLV2MPEG4, 1, [use flv2mpeg4 libeplayer3-arm]) AC_DEFINE(ENABLE_FLV2MPEG4, 1, [use flv2mpeg4 libeplayer3])
fi fi
AC_CONFIG_FILES([ AC_CONFIG_FILES([
@@ -111,8 +111,7 @@ libarmbox/Makefile
libazbox/Makefile libazbox/Makefile
libduckbox/Makefile libduckbox/Makefile
libdvbci/Makefile libdvbci/Makefile
libeplayer3-mips/Makefile libeplayer3/Makefile
libeplayer3-arm/Makefile
libeplayer3-sh4/Makefile libeplayer3-sh4/Makefile
libgeneric-pc/Makefile libgeneric-pc/Makefile
libraspi/Makefile libraspi/Makefile

8
libeplayer3/Makefile.am
View File

@@ -3,7 +3,7 @@ AM_CFLAGS = -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOUR
CXXFLAGS = -Wall CXXFLAGS = -Wall
noinst_LTLIBRARIES = libeplayer3_arm.la noinst_LTLIBRARIES = libeplayer3.la
AM_CPPFLAGS = -I$(srcdir)/include AM_CPPFLAGS = -I$(srcdir)/include
AM_CPPFLAGS += -I$(top_srcdir)/include AM_CPPFLAGS += -I$(top_srcdir)/include
@@ -59,11 +59,11 @@ SOURCE_FILES += \
output/writer/mipsel/wmv.c \ output/writer/mipsel/wmv.c \
output/writer/mipsel/vc1.c output/writer/mipsel/vc1.c
libeplayer3_arm_la_SOURCES = $(SOURCE_FILES) libeplayer3_la_SOURCES = $(SOURCE_FILES)
LIBEPLAYER3_LIBS = libeplayer3_arm.la -lpthread -lavformat -lavcodec -lavutil -lswresample LIBEPLAYER3_LIBS = libeplayer3.la -lpthread -lavformat -lavcodec -lavutil -lswresample
bin_PROGRAMS = eplayer3 bin_PROGRAMS = eplayer3
eplayer3_SOURCES = main/exteplayer.c eplayer3_SOURCES = main/exteplayer.c
eplayer3_LDADD = $(LIBEPLAYER3_LIBS) eplayer3_LDADD = $(LIBEPLAYER3_LIBS)
eplayer3_DEPENDENCIES = libeplayer3_arm.la eplayer3_DEPENDENCIES = libeplayer3.la