Skip to content

Commit

Permalink
bumped year, updated versions, added missing libavahi-client-dev to …
Browse files Browse the repository at this point in the history
…dependencies: ../README.markdown

	added proxy to help info:   main.c
  • Loading branch information
lprot authored and andoma committed Mar 20, 2018
1 parent 9cf3049 commit fd0a335
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 34 deletions.
16 changes: 7 additions & 9 deletions README.markdown
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Movian mediaplayer
==================

(c) 2006 - 2016 Lonelycoder AB
(c) 2006 - 2018 Lonelycoder AB

[![Build status](https://doozer.io/badge/andoma/movian/buildstatus/master)](https://doozer.io/user/andoma/movian)

Expand All @@ -11,17 +11,15 @@ For more information and latest versions, please visit:

## How to build for Linux

First you need to satisfy some dependencies:
For Ubuntu 12.04)
First you need to satisfy some dependencies (for Ubuntu 16.04.3 LTS)

sudo apt-get install libfreetype6-dev libfontconfig1-dev libxext-dev libgl1-mesa-dev libasound2-dev libasound2-dev libgtk2.0-dev libxss-dev libxxf86vm-dev libxv-dev libvdpau-dev yasm libpulse-dev libssl-dev curl libwebkitgtk-dev libsqlite3-dev
sudo apt-get install libfreetype6-dev libfontconfig1-dev libxext-dev libgl1-mesa-dev libasound2-dev libasound2-dev libgtk2.0-dev libxss-dev libxxf86vm-dev libxv-dev libvdpau-dev yasm libpulse-dev libssl-dev curl libwebkitgtk-dev libsqlite3-dev libavahi-client-dev

Then you need to configure:

./configure

If your system lacks libwebkitgtk (Ubuntu 12.04 before 12.04.1)
you can configure with
If your system lacks libwebkitgtk or some other lib you can configure like this:

./configure --disable-webkit

Expand Down Expand Up @@ -77,15 +75,15 @@ This will generate a DMG

## How to build for PS3 with PSL1GHT

$ ./Autobuild.sh -t ps3
$ ./Autobuild.sh -t ps3 -v 5.0.500

## How to build for Raspberry Pi

First you need to satisfy some dependencies (For Ubuntu 12.04LTS 64bit):
First you need to satisfy some dependencies (for Ubuntu 16.04.3 LTS 64bit):

sudo apt-get install git-core build-essential autoconf bison flex libelf-dev libtool pkg-config texinfo libncurses5-dev libz-dev python-dev libssl-dev libgmp3-dev ccache zip squashfs-tools

$ ./Autobuild.sh -t rpi
$ ./Autobuild.sh -t rpi -v 5.0.500

To update Movian on rpi with compiled one, enable Binreplace in settings:dev and issue:

Expand Down
51 changes: 26 additions & 25 deletions src/main.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2006-2016 Lonelycoder AB
* Copyright (C) 2006-2018 Lonelycoder AB
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -149,7 +149,7 @@ init_global_info(void)
prop_set(s, "name", PROP_SET_STRING, APPNAMEUSER);
prop_set(s, "version", PROP_SET_STRING, appversion);
prop_set(s, "fullversion", PROP_SET_STRING, appversion);
prop_set(s, "copyright", PROP_SET_STRING, "© 2006 - 2016 Lonelycoder AB");
prop_set(s, "copyright", PROP_SET_STRING, "© 2006 - 2018 Lonelycoder AB");
}


Expand Down Expand Up @@ -500,38 +500,39 @@ parse_opts(int argc, char **argv)
while(argc > 0) {
if(!strcmp(argv[0], "-h") || !strcmp(argv[0], "--help")) {
printf(APPNAMEUSER" %s\n"
"Copyright (C) 2006-2016 Lonelycoder AB\n"
"Copyright (C) 2006-2018 Lonelycoder AB\n"
"\n"
"Usage: %s [options] [<url>]\n"
"\n"
" Options:\n"
" -h, --help - This help text.\n"
" -d - Enable debug output.\n"
" --no-ui - Start without UI.\n"
" --fullscreen - Start in fullscreen mode.\n"
" --libav-log - Print libav log messages.\n"
" --with-standby - Enable system standby.\n"
" --with-poweroff - Enable system power-off.\n"
" -s <path> - Non-default settings path.\n"
" --ui <ui> - Use specified user interface.\n"
" -L <ip:host> - Send log messages to remote <ip:host>.\n"
" --syslog - Send log messages to syslog.\n"
" -h, --help - This help text.\n"
" -d - Enable debug output.\n"
" --no-ui - Start without UI.\n"
" --fullscreen - Start in fullscreen mode.\n"
" --libav-log - Print libav log messages.\n"
" --with-standby - Enable system standby.\n"
" --with-poweroff - Enable system power-off.\n"
" -s <path> - Non-default settings path.\n"
" --ui <ui> - Use specified user interface.\n"
" -L <ip:host> - Send log messages to remote <ip:host>.\n"
" --syslog - Send log messages to syslog.\n"
#if ENABLE_STDIN
" --stdin - Listen on stdin for events.\n"
" --stdin - Listen on stdin for events.\n"
#endif
" -v <view> - Use specific view for <url>.\n"
" --cache <path> - Set path for cache [%s].\n"
" -v <view> - Use specific view for <url>.\n"
" --cache <path> - Set path for cache [%s].\n"
" --persistent <path> - Set path for persistent stuff [%s].\n"
#if ENABLE_HTTPSERVER
" --disable-upnp - Disable UPNP/DLNA stack.\n"
" --disable-upnp - Disable UPNP/DLNA stack.\n"
#endif
" --disable-sd - Disable service discovery (mDNS, etc).\n"
" -p - Path to plugin directory to load\n"
" Intended for plugin development\n"
" --plugin-repo - URL to plugin repository\n"
" Intended for plugin development\n"
" -j <path> Load javascript file\n"
" --skin <skin> Select skin (for GLW ui)\n"
" --disable-sd - Disable service discovery (mDNS, etc).\n"
" -p - Path to plugin directory to load\n"
" Intended for plugin development\n"
" --plugin-repo - URL to plugin repository\n"
" Intended for plugin development\n"
" --proxy <host:port> - Use SOCKS 4/5 proxy for http requests.\n"
" -j <path> - Load javascript file\n"
" --skin <skin> - Select skin (for GLW ui)\n"
"\n"
" URL is any URL-type supported, "
"e.g., \"file:///...\"\n"
Expand Down

0 comments on commit fd0a335

Please sign in to comment.